fit print more compact

Sim/Fitting/FitPrintService.cpp

@@ -21,22 +21,6 @@
 #include <iostream>
 #include <sstream>
 
-namespace {
-
-size_t length_of_longest_name(const mumufit::Parameters& params)
-{
-    size_t result(0);
-    for (const auto& par : params) {
-        if (par.name().size() > result)
-            result = par.name().size();
-    }
-    return result;
-}
-
-} // namespace
-
-FitPrintService::FitPrintService() = default;
-
 void FitPrintService::print(const FitObjective& objective)
 {
     std::ostringstream ostr;
@@ -47,7 +31,6 @@ void FitPrintService::print(const FitObjective& objective)
     }
 
     ostr << iterationHeaderString(objective);
-    ostr << wallTimeString();
     ostr << parameterString(objective);
 
     if (objective.isCompleted())
@@ -60,20 +43,12 @@ std::string FitPrintService::iterationHeaderString(const FitObjective& objective
 {
     std::ostringstream result;
 
-    result << "FitPrintService::update -> Info."
-           << " NCall:" << objective.iterationInfo().iterationCount() << " Chi2:" << std::scientific
-           << std::setprecision(8) << objective.iterationInfo().chi2() << "\n";
-
-    return result.str();
-}
-
-std::string FitPrintService::wallTimeString()
-{
-    std::ostringstream result;
-
     m_last_call_time.stop();
-    result << "Wall time since last call:" << std::fixed << std::setprecision(2)
-           << m_last_call_time.runTime() << "\n";
+    result << "Fit iteration " << objective.iterationInfo().iterationCount()
+           << " Chi2 " << std::scientific
+           << std::setprecision(8) << objective.iterationInfo().chi2()
+           << " dt " << m_last_call_time.runTime()
+           << "\n";
     m_last_call_time.start();
 
     return result.str();
@@ -83,14 +58,10 @@ std::string FitPrintService::parameterString(const FitObjective& objective)
 {
     std::ostringstream result;
 
-    const auto params = objective.iterationInfo().parameters();
-    const auto length = length_of_longest_name(params);
-
-    for (const auto& par : params) {
-        result << Base::String::padRight(par.name(), length) << std::scientific
-               << std::setprecision(6) << "  " << par.startValue() << " " << par.limits().toString()
-               << "  " << par.value() << "\n";
-    }
+    result << "P";
+    for (const auto& par : objective.iterationInfo().parameters())
+        result << " " << std::scientific << std::setprecision(6) << par.value();
+    result << "\n";
 
     return result.str();
 }

Sim/Fitting/FitPrintService.h

@@ -27,13 +27,10 @@ class FitObjective;
 
 class FitPrintService {
 public:
-    FitPrintService();
-
     void print(const FitObjective& objective);
 
 private:
     std::string iterationHeaderString(const FitObjective& objective);
-    std::string wallTimeString();
     std::string parameterString(const FitObjective& objective);
     std::string fitResultString(const FitObjective& objective);
 

Sim/Fitting/FitStatus.h

@@ -23,12 +23,11 @@
 #include <functional>
 #include <vector>
 
+class FitObjective;
+class FitPrintService;
 namespace mumufit {
-
 class MinimizerResult;
 }
-class FitObjective;
-class FitPrintService;
 
 //! Contains status of the fitting (running, interupted etc) and all intermediate
 //! information which has to be collected during the fit.