Changeset 4321 for trunk/psLib/src/math/psMinimize.c

Timestamp:

Jun 20, 2005, 12:42:30 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

File:

• trunk/psLib/src/math/psMinimize.c (modified) (5 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-13 20:18:18 $
+ *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -562 +562 @@
 
 // XXX EAM this is my re-implementation of MinLM
-psBool psMinimizeLMChi2(psMinimization *min,
-                        psImage *covar,
-                        psVector *params,
-                        const psVector *paramMask,
-                        const psArray *x,
-                        const psVector *y,
-                        const psVector *yErr,
-                        psMinimizeLMChi2Func func)
+bool psMinimizeLMChi2(psMinimization *min,
+                      psImage *covar,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *x,
+                      const psVector *y,
+                      const psVector *yErr,
+                      psMinimizeLMChi2Func func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NULL);
@@ -1426 +1426 @@
 /******************************************************************************
  *****************************************************************************/
-psMinimization *psMinimizationAlloc(psS32 maxIter,
-                                    psF32 tol)
+psMinimization *psMinimizationAlloc(int maxIter,
+                                    float tol)
 {
     PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL);
@@ -1912 +1912 @@
 #define PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE 0.01
 
-psBool psMinimizePowell(psMinimization *min,
-                        psVector *params,
-                        const psVector *paramMask,
-                        const psArray *coords,
-                        psMinimizePowellFunc func)
+bool psMinimizePowell(psMinimization *min,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *coords,
+                      psMinimizePowellFunc func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NULL);
@@ -2189 +2189 @@
 psMinimizePowell().
  *****************************************************************************/
-psBool psMinimizeChi2Powell(psMinimization *min,
-                            psVector *params,
-                            const psVector *paramMask,
-                            const psArray *coords,
-                            const psVector *value,
-                            const psVector *error,
-                            psMinimizeChi2PowellFunc func)
+bool psMinimizeChi2Powell(psMinimization *min,
+                          psVector *params,
+                          const psVector *paramMask,
+                          const psArray *coords,
+                          const psVector *value,
+                          const psVector *error,
+                          psMinimizeChi2PowellFunc model)
 {
     myValue = (psVector *) value;
     myError = (psVector *) error;
 
-    Chi2PowellFunc = func;
+    Chi2PowellFunc = model;
 
     return(psMinimizePowell(min, params, paramMask, coords, myPowellChi2Func));