Changeset 2204 for trunk/psLib/src/dataManip/psMinimize.h

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/src/dataManip/psMinimize.h (modified) (5 diffs)

trunk/psLib/src/dataManip/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-26 23:14:04 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
 typedef struct
 {
-    int maxIter;                       ///< Convergence limit
+    psS32 maxIter;                       ///< Convergence limit
     float tol;                         ///< Error Tolerance
     float value;                       ///< Value of function at minimum
-    int iter;                          ///< Number of iterations required
+    psS32 iter;                          ///< Number of iterations required
     float lastDelta;                   ///< The last difference for the fit
 }
 psMinimization;
 
-psMinimization *psMinimizationAlloc(int maxIter,
+psMinimization *psMinimizationAlloc(psS32 maxIter,
                                     float tol);
 
@@ -88 +88 @@
                                   const psArray *x);
 
-bool psMinimizeLMChi2(psMinimization *min,
-                      psImage *covar,
-                      psVector *params,
-                      const psVector *paramMask,
-                      const psArray *x,
-                      const psVector *y,
-                      const psVector *yErr,
-                      psMinimizeLMChi2Func func);
+psBool psMinimizeLMChi2(psMinimization *min,
+                        psImage *covar,
+                        psVector *params,
+                        const psVector *paramMask,
+                        const psArray *x,
+                        const psVector *y,
+                        const psVector *yErr,
+                        psMinimizeLMChi2Func func);
 
 typedef
@@ -101 +101 @@
                               const psArray *coords);
 
-bool psMinimizePowell(psMinimization *min,
-                      psVector *params,
-                      const psVector *paramMask,
-                      const psArray *coords,
-                      psMinimizePowellFunc func);
+psBool psMinimizePowell(psMinimization *min,
+                        psVector *params,
+                        const psVector *paramMask,
+                        const psArray *coords,
+                        psMinimizePowellFunc func);
 
 typedef
@@ -111 +111 @@
                                       const psArray *coords);
 
-bool psMinimizeChi2Powell(psMinimization *min,
-                          psVector *params,
-                          const psVector *paramMask,
-                          const psArray *coords,
-                          const psVector *value,
-                          const psVector *error,
-                          psMinimizeChi2PowellFunc func);
+psBool psMinimizeChi2Powell(psMinimization *min,
+                            psVector *params,
+                            const psVector *paramMask,
+                            const psArray *coords,
+                            const psVector *value,
+                            const psVector *error,
+                            psMinimizeChi2PowellFunc func);