Changeset 6449

Timestamp:

Feb 17, 2006, 2:56:44 PM (20 years ago)

Author:

drobbin

Message:

Finished updating files affected by changing psArrayAlloc to set ->n=0.

Location:

trunk/psLib

Files:

• src/math/psMinimizePowell.c (modified) (3 diffs)
• src/math/psStats.c (modified) (2 diffs)
• test/math/tst_psMinimizeLMM.c (modified) (2 diffs)
• test/math/tst_psMinimizePowell.c (modified) (3 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.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-10 04:12:02 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-18 00:56:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -90 +90 @@
 Algorithm:
  
-XXX completely ad hoc: 
+XXX completely ad hoc:
 start with the user-supplied starting parameter and
 call that b.  Calculate a/c as a fractional amount smaller/larger than b.
 Repeat this process until a local minimum is found.
  
-XXX: new algorithm:  
+XXX: new algorithm:
 start at x=0, expand in one direction until the function
 decreases.  Then you have two points in the bracket.  Keep going until it
@@ -544 +544 @@
             }
         }
+        v->n++;
     }
 

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.168 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-17 00:56:48 $
+ *  @version $Revision: 1.169 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-18 00:56:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1854 +1854 @@
             y->data.F32[j] = newHistogramSmoothed->data.F32[i];
             x->data[j] = (psPtr *) psVectorAlloc(1, PS_TYPE_F32);
+            x->n++;
             ((psVector *) x->data[j])->data.F32[0] = PS_BIN_MIDPOINT(newHistogram, i);
             j++;

trunk/psLib/test/math/tst_psMinimizeLMM.c

@@ -20 +20 @@
 myFunc():
     sum = param[0] + x[0] * x[1] +
-          param[1] * x[0] + 
+          param[1] * x[0] +
           param[2] * x[0]^2 +
-          param[3] * x[1] + 
+          param[3] * x[1] +
           param[4] * x[1]^2
  
@@ -59 +59 @@
     psVector *myDerivs = psVectorAlloc(NUM_PARAMS, PS_TYPE_F32);
     psArray *myCoords = psArrayAlloc(NUM_DATA_POINTS);
+    myCoords->n = NUM_DATA_POINTS;
     psVector *y = psVectorAlloc(NUM_DATA_POINTS, PS_TYPE_F32);
 

trunk/psLib/test/math/tst_psMinimizePowell.c

@@ -84 +84 @@
 
     myCoords = psArrayAlloc(N);
+    myCoords->n = N;
     for (i=0;i<N;i++) {
         myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
@@ -158 +159 @@
 
     myCoords = psArrayAlloc(N);
+    myCoords->n = N;
     for (i=0;i<N;i++) {
         myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);
@@ -232 +234 @@
 
     myCoords = psArrayAlloc(N);
+    myCoords->n = N;
     for (i=0;i<N;i++) {
         myCoords->data[i] = (psPtr *) psVectorAlloc(2, PS_TYPE_F32);