Number of iterations in FitObjective

Core/Fitting/FitObjective.cpp

@@ -31,6 +31,7 @@ void insert_to(std::vector<double>& to, const std::vector<double>& from)
 FitObjective::FitObjective()
     : m_total_weight(0.0)
     , m_chi2_module(new ChiSquaredModule())
+    , m_iteration_count(0.0)
 {}
 
 FitObjective::~FitObjective() = default;
@@ -82,6 +83,8 @@ std::vector<double> FitObjective::evaluate_residuals(const Fit::Parameters& para
     for(size_t i = 0; i<m_simulation_array.size(); ++i)
         result.push_back(residual(m_simulation_array[i], m_experimental_array[i], weights[i]));
 
+    m_iteration_count++;
+
     return result;
 }
 
@@ -104,6 +107,11 @@ std::vector<double> FitObjective::simulation_array() const
     return m_simulation_array;
 }
 
+size_t FitObjective::numberOfIterations() const
+{
+    return m_iteration_count;
+}
+
 void FitObjective::run_simulations(const Fit::Parameters& params)
 {
     if (m_fit_objects.empty())

Core/Fitting/FitObjective.h

@@ -62,6 +62,9 @@ public:
     //! Data from different datasets merged together.
     std::vector<double> simulation_array() const;
 
+    //! Returns current number of simulation runs.
+    size_t numberOfIterations() const;
+
 private:
     void run_simulations(const Fit::Parameters& params);
     double residual(double a, double b, double weight) const;
@@ -72,6 +75,7 @@ private:
     SafePointerVector<SimDataPair> m_fit_objects;
     double m_total_weight;
     std::unique_ptr<IChiSquaredModule> m_chi2_module;
+    size_t m_iteration_count;
 };
 
 #endif  // FITOBJECTIVE_H