removed error computation from GOptimizerLM::optimize and added error()-method t…

…o GOptimizer base class. Further implemented GObservations::errors()

removed error computation from GOptimizerLM::optimize and added error()-method t…
…o GOptimizer base class. Further implemented GObservations::errors()
Michael Mayer
1 parent 41606bea
Showing 5 changed files with 30 additions and 5 deletions
include/GObservations.hpp
include/GOptimizer.hpp
include/GOptimizerLM.hpp
src/obs/GObservations.cpp
src/opt/GOptimizerLM.cpp
@@ -125,6 +125,7 @@ public:
     void                models(const std::string& filename);
     const GModels&      models(void) const;
     void                optimize(GOptimizer& opt);
+    void                errors(GOptimizer& opt);
     void                eval(void);
     double              logL(void) const;
     double              npred(void) const;
@@ -67,6 +67,7 @@ public:
     virtual GOptimizer* clone(void) const = 0;
     virtual std::string classname(void) const = 0;
     virtual void        optimize(GOptimizerFunction& fct, GOptimizerPars& pars) = 0;
+    virtual void        errors(GOptimizerFunction& fct, GOptimizerPars& pars) = 0;
     virtual double      value(void) const = 0;
     virtual int         status(void) const = 0;
     virtual int         iter(void) const = 0;
@@ -66,6 +66,7 @@ public:
     virtual GOptimizerLM* clone(void) const;
     virtual std::string   classname(void) const;
     virtual void          optimize(GOptimizerFunction& fct, GOptimizerPars& pars);
+    void                      errors(GOptimizerFunction& fct, GOptimizerPars& pars);
     virtual double        value(void) const { return m_value; }   //!< @brief Return function value
     virtual int           status(void) const { return m_status; } //!< @brief Return optimization status
     virtual int           iter(void) const { return m_iter; }     //!< @brief Return number of iterations
@@ -94,7 +95,6 @@ protected:
     void   copy_members(const GOptimizerLM& opt);
     void   free_members(void);
     void   iteration(GOptimizerFunction& fct, GOptimizerPars& pars);
-    void   errors(GOptimizerFunction& fct, GOptimizerPars& pars);
     double step_size(const GVector& grad, const GOptimizerPars& pars);
     // Protected members
@@ -722,6 +722,27 @@ void GObservations::optimize(GOptimizer&amp; opt)
 /***********************************************************************//**
+ * @brief Computes parameter errors using optimizer
+ *
+ * @param[in] opt Optimizer.
+ *
+ * Calculates the errors of the free parameters of the models by using
+ * the optimizer that has been provided by the @p opt argument.
+ ***************************************************************************/
+void GObservations::errors(GOptimizer& opt)
+{
+    // Extract optimizer parameter container from model container
+    GOptimizerPars pars = m_models.pars();
+
+    // Optimize model parameters
+    opt.errors(m_fct, pars);
+
+    // Return
+    return;
+}
+
+
+/***********************************************************************//**
  * @brief Evaluate function
  *
  * Evaluates the likelihood funtion at the actual set of parameters.
@@ -409,9 +409,6 @@ void GOptimizerLM::optimize(GOptimizerFunction&amp; fct, GOptimizerPars&amp; pars)
             }
         } // endfor: iterations
-
-        // Compute parameter uncertainties
-        errors(fct, pars);
         // Free now all temporarily frozen parameters so that the resulting
         // model has the same attributes as the initial model
@@ -432,7 +429,12 @@ void GOptimizerLM::optimize(GOptimizerFunction&amp; fct, GOptimizerPars&amp; pars)
     // ... otherwise just execute final step
     else {
-        errors(fct, pars);
+
+    	// Evaluate function
+        fct.eval(pars);
+
+        // Save function value
+        m_value = fct.value();
     }
     // Return