Add two new options to manage the format of the numerical output of s…

…ome observables (#100)

BaseObservable has two new protected members (`_general_format` and `_precision`) that can be set from the input file and are used to initialise `_number_formatter`, which can in turn used by inheriting observables to print numbers with a format that can be controlled by the user.

src/Observables/BaseObservable.cpp

@@ -30,6 +30,15 @@ void BaseObservable::update_data(llint curr_step) {
 void BaseObservable::get_settings(input_file &my_inp, input_file &sim_inp) {
  getInputString(&my_inp, "id", _id, 0);
  getInputLLInt(&my_inp, "update_every", &_update_every, 0);
+ getInputLLInt(&my_inp, "precision", &_precision, 0);
+ getInputBool(&my_inp, "general_format", &_general_format, 0);
+
+ if (_general_format) {
+ _number_formatter = Utils::sformat("%%.%dg", _precision);
+ }
+ else {
+ _number_formatter = Utils::sformat("%%10.%dlf", _precision);
+ }
 }
 
 void BaseObservable::init() {

src/Observables/BaseObservable.h

@@ -23,6 +23,9 @@ class BaseObservable {
  ConfigInfo *_config_info;
 
  std::string _id;
+ bool _general_format = false;
+ std::string _number_formatter;
+ long long int _precision = 6;
  long long int _update_every = 0;
  long long int _times_updated = 0;
 public:

src/Observables/ForceEnergy.cpp

@@ -37,5 +37,5 @@ std::string ForceEnergy::get_output_string(llint curr_step) {
  }
  U /= _config_info->N();
 
- return Utils::sformat("% 10.6lf", U);
+ return Utils::sformat(_number_formatter, U);
 }

src/Observables/PotentialEnergy.cpp

@@ -38,14 +38,14 @@ std::string PotentialEnergy::get_output_string(llint curr_step) {
  if(!_split) {
  number energy = get_potential_energy();
 
- return Utils::sformat("% 10.6lf", energy);
+ return Utils::sformat(_number_formatter, energy);
  }
  else {
  std::string res("");
  auto energies = _config_info->interaction->get_system_energy_split(_config_info->particles(), _config_info->lists);
  for(auto energy_item : energies) {
  number contrib = energy_item.second / _config_info->N();
- res = Utils::sformat("%s % 10.6lf", res.c_str(), contrib);
+ res = Utils::sformat("%s " + _number_formatter, res.c_str(), contrib);
  }
 
  return res;

src/Observables/PotentialEnergy.h

@@ -24,6 +24,7 @@
 class PotentialEnergy: public BaseObservable {
 protected:
  bool _split;
+
 public:
  PotentialEnergy();
  virtual ~PotentialEnergy();