Changeset 10255

Timestamp:

Nov 28, 2006, 4:33:54 PM (19 years ago)

Author:

magnier

Message:

constrain to constraint

Location:

trunk/psLib/src/math

Files:

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

trunk/psLib/src/math/psMinimizePowell.c

@@ -11 +11 @@
  *  NOTE: XXX: The SDR is silent about data types.  F32 is implemented here.
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-24 22:52:56 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-29 02:33:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -766 +766 @@
     psMinimization *min,
     psVector *params,
-    psMinConstrain *constrain,
+    psMinConstraint *constraint,
     const psArray *coords,
     const psVector *value,
@@ -783 +783 @@
     newCoords->data[coords->n + 2] = &model;
 
-    bool success = psMinimizePowell(min, params, constrain->paramMask, newCoords, myPowellChi2Func);
+    bool success = psMinimizePowell(min, params, constraint->paramMask, newCoords, myPowellChi2Func);
 
     newCoords->data[coords->n - 1] = NULL; // We can't free the array with a function pointer on it

trunk/psLib/src/math/psMinimizePowell.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-07 23:14:21 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-29 02:33:54 $
  *
  *  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
-    psMinConstrain *constrain,
+    psMinConstraint *constraint,
     const psArray *coords,             ///< Measurement coordinates
     const psVector *value,             ///< Measured values at the coordinates