Changeset 2740

Timestamp:

Dec 16, 2004, 2:18:11 PM (22 years ago)

Author:

gusciora

Message:

Set the x-vector range properly, generated new stderr and stdout.

Location:

trunk/psLib/test/dataManip

Files:

• tst_psMinimize04b.c (modified) (6 diffs)
• tst_psMinimize04b_F32.c (modified) (3 diffs)
• verified/tst_psMinimize04b.stderr (modified) (1 diff)
• verified/tst_psMinimize04b_F32.stderr (modified) (1 diff)

trunk/psLib/test/dataManip/tst_psMinimize04b.c

@@ -11 +11 @@
 #include "psMinimize.h"
 #include <math.h>
-#define NUM_DATA 20
+#define NUM_DATA 21
 #define POLY_ORDER 10
 #define A 2.0
@@ -47 +47 @@
         yErr->data.F64[i] = 1.0;
     }
-    p_psNormalizeVectorRangeF64(x,0.0,1.0);
+    p_psNormalizeVectorRangeF64(x, -1.0, 1.0);
 
     printPositiveTestHeader(stdout,
@@ -116 +116 @@
         y->data.F64[i] = setData(x->data.F64[i]);
     }
-    p_psNormalizeVectorRangeF64(x,0.0,1.0);
+    p_psNormalizeVectorRangeF64(x, -1.0, 1.0);
 
     printPositiveTestHeader(stdout,
@@ -179 +179 @@
         y->data.F64[i] = setData(x->data.F64[i]);
     }
-    p_psNormalizeVectorRangeF64(x,0.0,1.0);
+    p_psNormalizeVectorRangeF64(x, -1.0, 1.0);
 
     printPositiveTestHeader(stdout,
@@ -186 +186 @@
 
     psVectorFitPolynomial1D(myPoly, NULL, y, NULL);
+    //    psVectorFitPolynomial1D(myPoly, x, y, NULL);
 
     // We don't test the first or last few data items.
     for (i=IGNORE;i<NUM_DATA-IGNORE;i++) {
         double expectData = y->data.F64[i];
-        double actualData = psPolynomial1DEval(
-                                myPoly,
-                                x->data.F64[i]
-                            );
+        double actualData = psPolynomial1DEval(myPoly, x->data.F64[i]);
         if (fabs(actualData-expectData) > fabs(ERROR_TOLERANCE * expectData)) {
-            printf("ERROR: Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
+            printf("ERROR: Fitted data %d: (%.2f %.2f), expected was (%.2f)\n",
                    i, x->data.F64[i], actualData, expectData);
             testStatus = false;
@@ -201 +199 @@
         //      Remove for testing since print out differs from platforms
         //        } else {
-        //            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
+        //            printf("Fitted data %d: (%.2f %.2f), expected was (%.2f)\n",
         //                   i, x->data.F64[i], actualData, expectData);
         //        }

trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c

@@ -47 +47 @@
         yErr->data.F32[i] = 1.0;
     }
-    p_psNormalizeVectorRangeF32(x,0.0f,1.0f);
+    p_psNormalizeVectorRangeF32(x, -1.0f, 1.0f);
 
     printPositiveTestHeader(stdout,
@@ -116 +116 @@
         y->data.F32[i] = setData(x->data.F32[i]);
     }
-    p_psNormalizeVectorRangeF32(x,0.0f,1.0f);
+    p_psNormalizeVectorRangeF32(x, -1.0f, 1.0f);
 
     printPositiveTestHeader(stdout,
@@ -179 +179 @@
         y->data.F32[i] = setData(x->data.F32[i]);
     }
-    p_psNormalizeVectorRangeF32(x,0.0,1.0);
+    p_psNormalizeVectorRangeF32(x, -1.0, 1.0);
 
     printPositiveTestHeader(stdout,

trunk/psLib/test/dataManip/verified/tst_psMinimize04b.stderr

@@ -1 +1 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate an error for null arguments.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D
-    Unallowable operation: myPoly or its coeffs is NULL.
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+    Unallowable operation: polynomial myPoly or its coeffs is NULL.

trunk/psLib/test/dataManip/verified/tst_psMinimize04b_F32.stderr

@@ -1 +1 @@
 <DATE><TIME>|<HOST>|I|t03
     Following should generate error for null arguments.
-<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D
-    Unallowable operation: myPoly or its coeffs is NULL.
+<DATE><TIME>|<HOST>|E|psVectorFitPolynomial1D (psMinimize.c:<LINENO>)
+    Unallowable operation: polynomial myPoly or its coeffs is NULL.