Index: trunk/psLib/src/math/psMinimize.c
===================================================================
--- trunk/psLib/src/math/psMinimize.c	(revision 5175)
+++ trunk/psLib/src/math/psMinimize.c	(revision 5294)
@@ -10,6 +10,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.141 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-29 02:13:54 $
+ *  @version $Revision: 1.142 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-12 21:02:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1507,5 +1507,5 @@
     // XXX: these ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_1D_n, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->nX, NULL);
     PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     PS_ASSERT_VECTOR_TYPE(y, PS_TYPE_F64, NULL);
@@ -1571,5 +1571,5 @@
     fac = 2.0/((psF32) n);
     // XXX: is this loop bound correct?
-    for (j=0;j<myPoly->COOL_1D_n+1;j++) {
+    for (j=0;j<myPoly->nX+1;j++) {
         sum = 0.0;
         for (k=0;k<n;k++) {
@@ -1600,5 +1600,5 @@
     // XXX: these ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_1D_n, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->nX, NULL);
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
     PS_ASSERT_VECTOR_TYPE(f, PS_TYPE_F64, NULL);
@@ -1643,5 +1643,5 @@
     }
 
-    nTerm = 1 + myPoly->COOL_1D_n;
+    nTerm = 1 + myPoly->nX;
     nOrder = nTerm - 1;
 
@@ -1743,5 +1743,5 @@
 
     PS_ASSERT_POLY_NON_NULL(poly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(poly->COOL_1D_n, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(poly->nX, NULL);
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
     PS_ASSERT_VECTOR_NON_EMPTY(f, NULL);
@@ -1883,6 +1883,6 @@
     // These ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_2D_nX, NULL);
-    PS_ASSERT_INT_NONNEGATIVE(myPoly->COOL_2D_nY, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->nX, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->nY, NULL);
 
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
@@ -1911,6 +1911,6 @@
 
     // XXX:Watch for changes to the psPolys: nTerm != nOrder.
-    psS32 nXterm = 1 + myPoly->COOL_2D_nX;
-    psS32 nYterm = 1 + myPoly->COOL_2D_nY;
+    psS32 nXterm = 1 + myPoly->nX;
+    psS32 nYterm = 1 + myPoly->nY;
     nTerm = nXterm * nYterm;
 
@@ -2310,7 +2310,7 @@
     // These ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, 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_INT_NONNEGATIVE(myPoly->nX, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->nY, NULL);
+    PS_ASSERT_INT_NONNEGATIVE(myPoly->nZ, NULL);
 
     PS_ASSERT_VECTOR_NON_NULL(f, NULL);
@@ -2573,8 +2573,8 @@
     // These ASSERTS are redundant.
     PS_ASSERT_POLY_NON_NULL(myPoly, 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_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_VECTOR_NON_NULL(f, NULL);
     PS_ASSERT_VECTOR_TYPE(f, PS_TYPE_F64, NULL);