Commit a243ab48ecd5558413a717e73da1fe07f54e7af5

Authored by Jürgen Knödlseder
1 parent 7a6bf544

Limit maximum number of function decreases.

Showing 1 changed file with 2 additions and 0 deletions
include/GOptimizerLM.hpp
@@ -110,6 +110,7 @@ protected: @@ -110,6 +110,7 @@ protected:
110 int m_max_iter; //!< Maximum number of iterations 110 int m_max_iter; //!< Maximum number of iterations
111 int m_max_stall; //!< Maximum number of stalls 111 int m_max_stall; //!< Maximum number of stalls
112 int m_max_hit; //!< Maximum number of successive hits 112 int m_max_hit; //!< Maximum number of successive hits
  113 + int m_max_dec; //!< Maximum number of function decrease
113 bool m_step_adjust; //!< Adjust step size to boundaries 114 bool m_step_adjust; //!< Adjust step size to boundaries
114 std::vector<bool> m_hit_boundary; //!< Bookkeeping array for boundary hits 115 std::vector<bool> m_hit_boundary; //!< Bookkeeping array for boundary hits
115 std::vector<int> m_hit_minimum; //!< Bookkeeping of successive minimum hits 116 std::vector<int> m_hit_minimum; //!< Bookkeeping of successive minimum hits
@@ -121,6 +122,7 @@ protected: @@ -121,6 +122,7 @@ protected:
121 double m_delta; //!< Function improvement 122 double m_delta; //!< Function improvement
122 int m_status; //!< Fit status 123 int m_status; //!< Fit status
123 int m_iter; //!< Iteration 124 int m_iter; //!< Iteration
  125 + int m_num_dec; //!< Number of function decreases
124 GLog* m_logger; //!< Pointer to optional logger 126 GLog* m_logger; //!< Pointer to optional logger
125 127
126 }; 128 };