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

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/math/psMinimize.c (modified) (21 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLF, MHPCC
  *
- *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-26 23:14:04 $
+ *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -59 +59 @@
  *****************************************************************************/
 void p_psBuildSums1D(double x,
-                     int polyOrder,
+                     psS32 polyOrder,
                      psVector* sums)
 {
-    int i = 0;
+    psS32 i = 0;
     double xSum = 0.0;
 
@@ -101 +101 @@
             "---- CalculateSecondDerivs() begin ----\n");
 
-    int i;
-    int k;
-    bool mustFreeX = false;
+    psS32 i;
+    psS32 k;
+    psBool mustFreeX = false;
     float sig;
     float p;
-    int n = y->n;
+    psS32 n = y->n;
     float *u = (float *) psAlloc(n * sizeof(float));
     float *derivs2 = (float *) psAlloc(n * sizeof(float));
@@ -173 +173 @@
                          float X)
 {
-    int n;
-    int klo;
-    int khi;
+    psS32 n;
+    psS32 klo;
+    psS32 khi;
     float H;
     float A;
@@ -240 +240 @@
     psTrace(".psLib.dataManip.psVectorFitSpline1D", 4,
             "---- psVectorFitSpline1D() begin ----\n");
-    int numSplines = (y->n)-1;
+    psS32 numSplines = (y->n)-1;
     float tmp;
     float H;
-    int i;
+    psS32 i;
     float slope;
     psVector *x32 = NULL;
@@ -416 +416 @@
      the F64 port might be.
  *****************************************************************************/
-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)
 {
     PS_CHECK_NULL_PTR_RETURN_NULL(min);
@@ -441 +441 @@
     psTrace(".psLib.dataManip.psMinimizeLMChi2", 4,
             "---- psMinimizeLMChi2() begin ----\n");
-    int numData = y->n;
-    int numParams = params->n;
-    int i;
-    int j;
-    int k;
-    int l;
-    int n;
-    int p;
+    psS32 numData = y->n;
+    psS32 numParams = params->n;
+    psS32 i;
+    psS32 j;
+    psS32 k;
+    psS32 l;
+    psS32 n;
+    psS32 p;
     psVector *beta = psVectorAlloc(numParams, PS_TYPE_F64);
     psVector *perm = psVectorAlloc(numParams, PS_TYPE_F64);
@@ -663 +663 @@
         const psVector* restrict yErr)
 {
-    int j;
-    int k;
-    int n = x->n;
+    psS32 j;
+    psS32 k;
+    psS32 n = x->n;
     double fac;
     double sum;
@@ -689 +689 @@
     // are fitting this ChebyShev polynomial to.
 
-    for (int i=0;i<n;i++) {
+    for (psS32 i=0;i<n;i++) {
         // NR 5.8.4
         double Y = cos(M_PI * (0.5 + ((float) i)) / ((float) n));
@@ -741 +741 @@
         const psVector* restrict yErr)
 {
-    int polyOrder = myPoly->n;
+    psS32 polyOrder = myPoly->n;
     psImage* A = NULL;
     psImage* ALUD = NULL;
@@ -748 +748 @@
     psVector* X = NULL;         // NOTE: do we need this?
     psVector* coeffs = NULL;
-    int i = 0;
-    int j = 0;
-    int k = 0;
+    psS32 i = 0;
+    psS32 j = 0;
+    psS32 k = 0;
     psVector* xSums = NULL;
 
@@ -853 +853 @@
                                         const psVector* restrict yErr)
 {
-    int i;
+    psS32 i;
     psPolynomial1D *tmpPoly;
     PS_CHECK_NULL_1DPOLY_RETURN_NULL(myPoly);
@@ -908 +908 @@
 /******************************************************************************
  *****************************************************************************/
-psMinimization *psMinimizationAlloc(int maxIter,
+psMinimization *psMinimizationAlloc(psS32 maxIter,
                                     float tol)
 {
@@ -952 +952 @@
     float fb = 0.0;
     float fc = 0.0;
-    int iter = 100;
+    psS32 iter = 100;
     float aDir = 0.0;
     float cDir = 0.0;
@@ -960 +960 @@
     float stepSize = DETERMINE_BRACKET_STEP_SIZE;
     psVector *tmp = NULL;
-    int i = 0;
-    int null = 0;
+    psS32 i = 0;
+    psS32 null = 0;
 
     psTrace(".psLib.dataManip.p_psDetermineBracket", 4,
@@ -1141 +1141 @@
     psVector *tmpc = NULL;
     psVector *tmpn = NULL;
-    int i = 0;
-    int null = 0;
+    psS32 i = 0;
+    psS32 null = 0;
 
     psTrace(".psLib.dataManip.p_psLineMin", 4,
@@ -1313 +1313 @@
 XXX: Check for F32 types?
  *****************************************************************************/
-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)
 {
     PS_CHECK_NULL_VECTOR_RETURN_NULL(params);
@@ -1325 +1325 @@
     PS_CHECK_NULL_PTR_RETURN_NULL(func);
 
-    int numDims = params->n;
-    int i = 0;
-    int j = 0;
+    psS32 numDims = params->n;
+    psS32 i = 0;
+    psS32 j = 0;
     psVector **v = NULL;
     psVector *pQP = NULL;
@@ -1337 +1337 @@
     float baseFuncVal = 0.0;
     float currFuncVal = 0.0;
-    int biggestIter = 0;
+    psS32 biggestIter = 0;
     float biggestDiff = 0.0;
     float term1 = 0.0;
@@ -1529 +1529 @@
     float chi2 = 0.0;
     float d;
-    int i;
+    psS32 i;
     psVector *tmp;
 
@@ -1552 +1552 @@
 psMinimizePowell().
  *****************************************************************************/
-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)
 {
     myValue = (psVector *) value;