Changeset 6226 for trunk/psLib/src/math/psMinimizeLMM.h

Timestamp:

Jan 27, 2006, 10:08:58 AM (20 years ago)

Author:

gusciora

Message:

I added tests for psImageSmooth, modified the psStats stuff and the Min
routines.

File:

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

trunk/psLib/src/math/psMinimizeLMM.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-23 20:44:29 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-27 20:08:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -52 +52 @@
 psMinimization;
 
+
+/** A data structure for minimization routines.
+ *
+ *  
+ */
+typedef struct
+{
+    psVector *paramMask;                ///< valid / invalid parameters
+    psVector *paramMax;                 ///< max allowed parameters
+    psVector *paramMin;                 ///< min allowed parameters
+    psVector *paramDelta;               ///< max allowed param swing
+}
+psMinConstrain;
+
+psMinConstrain *psMinConstrainAlloc();
+
 #define P_PSMINIMIZATION_SET_MAXITER(m,val) *(int*)&m->maxIter = val
         #define P_PSMINIMIZATION_SET_TOL(m,val) *(float*)&m->tol = val
-
 
                 /** Allocates a psMinimization structure.
@@ -97 +112 @@
     psImage *covar,                    ///< Covariance matrix
     psVector *params,                  ///< "Best Guess" for the parameters that minimize func
-    const psVector *paramMask,         ///< Parameters to be held fixed by the minimizer
+    psMinConstrain *constrain,         ///< Constraints on the parameters
     const psArray *x,                  ///< Measurement ordinates of multiple vectors
     const psVector *y,                 ///< Measurement coordinates