Changeset 2091

Timestamp:

Oct 13, 2004, 12:35:53 PM (22 years ago)

Author:

evanalst

Message:

Update test cases and verified files.

Location:

trunk/psLib/test/dataManip

Files:

• tst_psMinimize04_F32.c (modified) (9 diffs)
• verified/tst_psMinimize04_F32.stdout (modified) (4 diffs)

trunk/psLib/test/dataManip/tst_psMinimize04_F32.c

@@ -55 +55 @@
         y->data.F32[i] = setData(x->data.F32[i]);
         yErr->data.F32[i] = YERR;
-        printf("Original data %d: (%.1f %.1f)\n", i, x->data.F32[i], y->data.F32[i]);
+        //        printf("Original data %d: (%.1f %.1f)\n", i, x->data.F32[i], y->data.F32[i]);
     }
 
@@ -64 +64 @@
     psVectorFitPolynomial1D(myPoly, x, y, yErr);
 
-    for (i=0;i<POLY_ORDER+1;i++) {
-        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
-    }
+    //    for (i=0;i<POLY_ORDER+1;i++) {
+    //        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
+    //    }
 
     for (i=0;i<NUM_DATA;i++) {
@@ -75 +75 @@
                    i, x->data.F32[i], actualData, expectData);
             testStatus = false;
-        } else {
-            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
-                   i, x->data.F32[i], actualData, expectData);
+            //        } else {
+            //            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
+            //                   i, x->data.F32[i], actualData, expectData);
         }
     }
@@ -119 +119 @@
         x->data.F32[i] = (float) i;
         y->data.F32[i] = setData(x->data.F32[i]);
-        printf("Original data %d: (%.1f %.1f)\n", i, x->data.F32[i], y->data.F32[i]);
+        //        printf("Original data %d: (%.1f %.1f)\n", i, x->data.F32[i], y->data.F32[i]);
     }
 
@@ -128 +128 @@
     psVectorFitPolynomial1D(myPoly, x, y, NULL);
 
-    for (i=0;i<POLY_ORDER+1;i++) {
-        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
-    }
+    //    for (i=0;i<POLY_ORDER+1;i++) {
+    //        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
+    //    }
 
     for (i=0;i<NUM_DATA;i++) {
@@ -139 +139 @@
                    i, x->data.F32[i], actualData, expectData);
             testStatus = false;
-        } else {
-            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
-                   i, x->data.F32[i], actualData, expectData);
+            //        } else {
+            //            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
+            //                   i, x->data.F32[i], actualData, expectData);
         }
     }
@@ -179 +179 @@
     for (i=0;i<NUM_DATA;i++) {
         y->data.F32[i] = setData((float) i);
-        printf("Original data %d: (%.1f)\n", i, y->data.F32[i]);
+        //        printf("Original data %d: (%.1f)\n", i, y->data.F32[i]);
     }
 
@@ -188 +188 @@
     psVectorFitPolynomial1D(myPoly, NULL, y, NULL);
 
-    for (i=0;i<POLY_ORDER+1;i++) {
-        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
-    }
+    //    for (i=0;i<POLY_ORDER+1;i++) {
+    //        printf("Polynomial coefficient %d is %0.1f\n", i, myPoly->coeff[i]);
+    //    }
 
     for (i=0;i<NUM_DATA;i++) {
@@ -199 +199 @@
                    i, (float) i, actualData, expectData);
             testStatus = false;
-        } else {
-            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
-                   i, (float) i, actualData, expectData);
+            //        } else {
+            //            printf("Fitted data %d: (%.1f %.1f), expected was (%.1f)\n",
+            //                   i, (float) i, actualData, expectData);
         }
     }

trunk/psLib/test/dataManip/verified/tst_psMinimize04_F32.stdout

@@ -1 @@
-Original data 0: (0.0 3.0)
-Original data 1: (1.0 8.0)
-Original data 2: (2.0 19.0)
-Original data 3: (3.0 36.0)
-Original data 4: (4.0 59.0)
-Original data 5: (5.0 88.0)
-Original data 6: (6.0 123.0)
-Original data 7: (7.0 164.0)
-Original data 8: (8.0 211.0)
-Original data 9: (9.0 264.0)
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMinimize04_F32.c                                     *
@@ -15 +5 @@
 \**********************************************************************************/
 
-Polynomial coefficient 0 is 3.0
-Polynomial coefficient 1 is 2.0
-Polynomial coefficient 2 is 3.0
-Polynomial coefficient 3 is -0.0
-Polynomial coefficient 4 is 0.0
-Polynomial coefficient 5 is -0.0
-Fitted data 0: (0.0 3.0), expected was (3.0)
-Fitted data 1: (1.0 8.0), expected was (8.0)
-Fitted data 2: (2.0 19.0), expected was (19.0)
-Fitted data 3: (3.0 36.0), expected was (36.0)
-Fitted data 4: (4.0 59.0), expected was (59.0)
-Fitted data 5: (5.0 88.0), expected was (88.0)
-Fitted data 6: (6.0 123.0), expected was (123.0)
-Fitted data 7: (7.0 164.0), expected was (164.0)
-Fitted data 8: (8.0 211.0), expected was (211.0)
-Fitted data 9: (9.0 264.0), expected was (264.0)
 
 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): equal errors in yErr} | tst_psMinimize04_F32.c)
 
-Original data 0: (0.0 3.0)
-Original data 1: (1.0 8.0)
-Original data 2: (2.0 19.0)
-Original data 3: (3.0 36.0)
-Original data 4: (4.0 59.0)
-Original data 5: (5.0 88.0)
-Original data 6: (6.0 123.0)
-Original data 7: (7.0 164.0)
-Original data 8: (8.0 211.0)
-Original data 9: (9.0 264.0)
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMinimize04_F32.c                                     *
@@ -50 +14 @@
 \**********************************************************************************/
 
-Polynomial coefficient 0 is 3.0
-Polynomial coefficient 1 is 2.0
-Polynomial coefficient 2 is 3.0
-Polynomial coefficient 3 is -0.0
-Polynomial coefficient 4 is 0.0
-Polynomial coefficient 5 is -0.0
-Fitted data 0: (0.0 3.0), expected was (3.0)
-Fitted data 1: (1.0 8.0), expected was (8.0)
-Fitted data 2: (2.0 19.0), expected was (19.0)
-Fitted data 3: (3.0 36.0), expected was (36.0)
-Fitted data 4: (4.0 59.0), expected was (59.0)
-Fitted data 5: (5.0 88.0), expected was (88.0)
-Fitted data 6: (6.0 123.0), expected was (123.0)
-Fitted data 7: (7.0 164.0), expected was (164.0)
-Fitted data 8: (8.0 211.0), expected was (211.0)
-Fitted data 9: (9.0 264.0), expected was (264.0)
 
 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): yErr is NULL} | tst_psMinimize04_F32.c)
 
-Original data 0: (3.0)
-Original data 1: (8.0)
-Original data 2: (19.0)
-Original data 3: (36.0)
-Original data 4: (59.0)
-Original data 5: (88.0)
-Original data 6: (123.0)
-Original data 7: (164.0)
-Original data 8: (211.0)
-Original data 9: (264.0)
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMinimize04_F32.c                                     *
@@ -85 +23 @@
 \**********************************************************************************/
 
-Polynomial coefficient 0 is 3.0
-Polynomial coefficient 1 is 2.0
-Polynomial coefficient 2 is 3.0
-Polynomial coefficient 3 is -0.0
-Polynomial coefficient 4 is 0.0
-Polynomial coefficient 5 is -0.0
-Fitted data 0: (0.0 3.0), expected was (3.0)
-Fitted data 1: (1.0 8.0), expected was (8.0)
-Fitted data 2: (2.0 19.0), expected was (19.0)
-Fitted data 3: (3.0 36.0), expected was (36.0)
-Fitted data 4: (4.0 59.0), expected was (59.0)
-Fitted data 5: (5.0 88.0), expected was (88.0)
-Fitted data 6: (6.0 123.0), expected was (123.0)
-Fitted data 7: (7.0 164.0), expected was (164.0)
-Fitted data 8: (8.0 211.0), expected was (211.0)
-Fitted data 9: (9.0 264.0), expected was (264.0)
 
 ---> TESTPOINT PASSED (psMinimize functions{psVectorFitPolynomial1D(): x, yErr is NULL} | tst_psMinimize04_F32.c)