Changeset 29060 for branches/sc_branches/trunkTest/psLib/src/math/psMinimizeLMM.h

Timestamp:

Aug 26, 2010, 9:18:39 AM (16 years ago)

Author:

Serge CHASTEL

Message:

Merging trunk in branch

Location:

branches/sc_branches/trunkTest

Files:

• . (modified) (1 prop)
• psLib/src/math/psMinimizeLMM.h (modified) (3 diffs)

branches/sc_branches/trunkTest/psLib/src/math/psMinimizeLMM.h

@@ -33 +33 @@
 #define PS_MAX_LMM_ITERATIONS 100
 #define PS_MAX_MINIMIZE_ITERATIONS 100
-#define P_PSMINIMIZATION_SET_MAXITER(m,val) *(int*)&m->maxIter = val
-        #define P_PSMINIMIZATION_SET_TOL(m,val) *(float*)&m->tol = val
+#define P_PSMINIMIZATION_SET_MAXITER(m,val) { *(int*)&m->maxIter  = val; }
+#define P_PSMINIMIZATION_SET_MIN_TOL(m,val) { *(float*)&m->minTol = val; }
+#define P_PSMINIMIZATION_SET_MAX_TOL(m,val) { *(float*)&m->maxTol = val; }
 
                 typedef enum {
@@ -75 +76 @@
 typedef struct
 {
-    const int maxIter;                 ///< Convergence limit
-    const float tol;                   ///< Error Tolerance
+    const int maxIter;                  ///< Convergence limit
+    const float minTol;                 ///< Convergence Tolerance (stop if we reach this value)
+    const float maxTol;                 ///< Max Tolerance (accept fit if last improvement was this good)
     float value;                       ///< Value of function at minimum
     int iter;                          ///< Number of iterations to date
     float lastDelta;                   ///< The last difference for the fit
+    float maxChisqDOF;                 ///< for Chisq minimization, require that we reach here before checking tolerance
 }
 psMinimization;
@@ -102 +105 @@
 psMinimization *psMinimizationAlloc(
     int maxIter,                       ///< Number of minimization iterations to perform.
-    float tol                          ///< Requested error tolerance
+    float minTol,                      ///< stop if tolerance is less than this
+    float maxTol                       ///< accept fit if tolerance is less than this
 ) PS_ATTR_MALLOC;