Changeset 6346 for trunk/psLib/src/math

Timestamp:

Feb 7, 2006, 1:14:21 PM (20 years ago)

Author:

gusciora

Message:

....

Location:

trunk/psLib/src/math

Files:

• psMinimizeLMM.c (modified) (2 diffs)
• psMinimizePowell.c (modified) (3 diffs)
• psMinimizePowell.h (modified) (2 diffs)

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-03 22:05:22 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-07 23:14:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -513 +513 @@
 }
 
-// XXX EAM : temporary gauss-jordan solver based on gene's
+// This is a temporary gauss-jordan solver based on gene's
 // version based on the Numerical Recipes version
 bool psGaussJordan(

trunk/psLib/src/math/psMinimizePowell.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-03 22:05:22 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-07 23:14:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -740 +740 @@
     psMinimization *min,
     psVector *params,
-    const psVector *paramMask,
+    psMinConstrain *constrain,
     const psArray *coords,
     const psVector *value,
@@ -751 +751 @@
     Chi2PowellFunc = model;
 
-    return(psMinimizePowell(min, params, paramMask, coords, myPowellChi2Func));
+    return(psMinimizePowell(min, params, constrain->paramMask, coords, myPowellChi2Func));
 }
 

trunk/psLib/src/math/psMinimizePowell.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-02-07 23:14:21 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -81 +81 @@
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
-    const psVector *paramMask,         ///< Parameters to be held fixed by minimizer
+    psMinConstrain *constrain,
     const psArray *coords,             ///< Measurement coordinates
     const psVector *value,             ///< Measured values at the coordinates