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

Timestamp:

Sep 21, 2005, 4:47:16 PM (21 years ago)

Author:

gusciora

Message:

The nX terms for the polynomials now refer to the order, not the number
of terms.

File:

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

trunk/psLib/src/math/psMinimize.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.138 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-13 21:43:47 $
+ *  @version $Revision: 1.139 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-22 02:47:16 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1459 +1459 @@
     // XXX: these ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->n, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_1D_n, NULL);
     PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL);
@@ -1523 +1523 @@
     fac = 2.0/((psF32) n);
     // XXX: is this loop bound correct?
-    for (j=0;j<myPoly->n;j++) {
+    for (j=0;j<myPoly->COOL_1D_n+1;j++) {
         sum = 0.0;
         for (k=0;k<n;k++) {
@@ -1552 +1552 @@
     // XXX: these ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->n, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_1D_n, NULL);
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
     PS_ASSERT_VECTOR_TYPE(f, PS_TYPE_F64, NULL);
@@ -1597 +1597 @@
     }
 
-    nTerm = myPoly->n;
+    nTerm = 1 + myPoly->COOL_1D_n;
     nOrder = nTerm - 1;
 
@@ -1697 +1697 @@
 
     PS_ASSERT_POLY_NON_NULL(poly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(poly->n, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(poly->COOL_1D_n, NULL);
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
     PS_ASSERT_VECTOR_NON_EMPTY(f, NULL);
@@ -1837 +1837 @@
     // These ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nX, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nY, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_2D_nX, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_2D_nY, NULL);
 
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
@@ -1865 +1865 @@
 
     // XXX:Watch for changes to the psPolys: nTerm != nOrder.
-    psS32 nXterm = myPoly->nX;
-    psS32 nYterm = myPoly->nY;
+    psS32 nXterm = 1 + myPoly->COOL_2D_nX;
+    psS32 nYterm = 1 + myPoly->COOL_2D_nY;
     nTerm = nXterm * nYterm;
 
@@ -2264 +2264 @@
     // These ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nX, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nY, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nZ, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_3D_nX, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_3D_nY, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_3D_nZ, NULL);
 
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
@@ -2527 +2527 @@
     // These ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nX, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nY, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nZ, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->nT, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_4D_nX, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_4D_nY, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_4D_nZ, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_4D_nT, NULL);
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
     PS_ASSERT_VECTOR_TYPE(f, PS_TYPE_F64, NULL);