Changeset 35637 for branches/eam_branches/ipp-20130509/psLib/src/math/psMinimizeLMM.h

Timestamp:

Jun 9, 2013, 3:27:54 PM (13 years ago)

Author:

eugene

Message:

choice of convergence method via user selections

File:

• branches/eam_branches/ipp-20130509/psLib/src/math/psMinimizeLMM.h (modified) (2 diffs)

branches/eam_branches/ipp-20130509/psLib/src/math/psMinimizeLMM.h

@@ -30 +30 @@
 #include "psConstants.h"
 
+# define PS_MINIMIZE_LMM_GAIN_FACTOR_MODE 0
+# define PS_MINIMIZE_LMM_CHISQ_CONVERGENCE 1
+
 #define PS_DETERMINE_BRACKET_STEP_SIZE 0.10
 #define PS_MAX_LMM_ITERATIONS 100
@@ -82 +85 @@
     int iter;                          ///< Number of iterations to date
     float lastDelta;                   ///< The last difference for the fit
+    float rParSigma;                   ///< last fractional change in the parameters
     float maxChisqDOF;                 ///< for Chisq minimization, require that we reach here before checking tolerance
+    int gainFactorMode;
+    bool chisqConvergence;
 }
 psMinimization;