Domenico Tiziani / gammalib

Commit 40f980b8dcb84c920bf125170f7d1d853b71bb4c

Authored by knodlseder
1 parent e3898f69

update

Inline Side-by-side
Showing 1 changed file with 7 additions and 7 deletions
src/opt/GOptimizerLM.cpp
  View file @40f980b
... ... @@ -92,7 +92,7 @@ GOptimizerLM::GOptimizerLM(const GOptimizerLM& opt) : GOptimizer(opt)
92 92 /***********************************************************************//**
93 93 * @brief Destructor
94 94 ***************************************************************************/
95   -GOptimizerLM::~GOptimizerLM()
  95 +GOptimizerLM::~GOptimizerLM(void)
96 96 {
97 97 // Free members
98 98 free_members();
... ... @@ -143,7 +143,8 @@ GOptimizerLM& GOptimizerLM::operator= (const GOptimizerLM& opt)
143 143 * @param[in] fct Optimization function.
144 144 * @param[in] p Parameters to be optimised.
145 145 ***************************************************************************/
146   -GOptimizerPars& GOptimizerLM::operator() (GOptimizerFunction& fct, GOptimizerPars& p)
  146 +GOptimizerPars& GOptimizerLM::operator()(GOptimizerFunction& fct,
  147 + GOptimizerPars& p)
147 148 {
148 149 // Initalise output parameters with input parameters
149 150 GOptimizerPars* pars = new GOptimizerPars(p);
... ... @@ -276,7 +277,7 @@ void GOptimizerLM::init_members(void)
276 277 m_lambda_dec = 0.1;
277 278 m_eps = 1.0e-6;
278 279 m_max_iter = 1000;
279   - m_max_stall = 10;
  280 + m_max_stall = 5;
280 281 m_max_hit = 3; //!< Maximum successive boundary hits before freeze
281 282 m_step_adjust = true;
282 283  
... ... @@ -335,7 +336,6 @@ void GOptimizerLM::copy_members(const GOptimizerLM&amp; opt)
335 336 ***************************************************************************/
336 337 void GOptimizerLM::free_members(void)
337 338 {
338   -
339 339 // Return
340 340 return;
341 341 }
... ... @@ -382,7 +382,7 @@ void GOptimizerLM::optimize(GOptimizerFunction* fct, GOptimizerPars* pars)
382 382 m_hit_maximum.push_back(0);
383 383 m_par_freeze.push_back(false);
384 384 }
385   -
  385 +
386 386 // Initial evaluation
387 387 fct->eval(*pars);
388 388  
... ... @@ -587,7 +587,7 @@ void GOptimizerLM::iteration(GOptimizerFunction* fct, GOptimizerPars* pars)
587 587  
588 588 // Get LM step size
589 589 double step = step_size(grad, pars);
590   -
  590 +
591 591 // Derive new parameter vector
592 592 for (int ipar = 0; ipar < m_npars; ++ipar) {
593 593  
... ... @@ -697,7 +697,7 @@ void GOptimizerLM::iteration(GOptimizerFunction* fct, GOptimizerPars* pars)
697 697 m_lambda *= m_lambda_inc;
698 698  
699 699 // ... otherwise, if the statistics did not improve then use old parameters
700   - // and increase lamdba. Restore also the best statistics value that was
  700 + // and increase lamdba. Restore also the best statistics value that was
701 701 // reached so far, the gradient vector and the curve matrix.
702 702 else {
703 703 m_lambda *= m_lambda_inc;
... ...