Changeset 1985 for trunk/psLib/test/dataManip/tst_psFunc07.c

Timestamp:

Oct 6, 2004, 12:27:06 PM (22 years ago)

Author:

gusciora

Message:

Added F64 version of spline eval tests.

File:

• trunk/psLib/test/dataManip/tst_psFunc07.c (modified) (10 diffs)

trunk/psLib/test/dataManip/tst_psFunc07.c

@@ -4 +4 @@
 values, sets the spline polynomials with psVectorFitSpline1D(), then calls
 psSpline1DEval() on new data values and ensures that the results are correct.
+ 
+F32 and F64 versions are used here.
+ 
+XXX: The spline eval functions are F32 only, while the spline fit functions
+are F32 and F64.
  *****************************************************************************/
 #include <stdio.h>
@@ -62 +67 @@
     printPositiveTestHeader(stdout,
                             "psFunction functions",
-                            "psSpline1DAlloc()");
+                            "psSpline1DAlloc(), psVectorFitSpline1D, psSpline1DEvalVector: F32 versions");
 
     psVectorFitSpline1D(tmpSpline, x, y, NULL);
@@ -71 +76 @@
             printf("ERROR[%d]: f(%f) is %f.  Should be %f\n", i,
                    newX->data.F32[i], newY->data.F32[i], myFunc(newX->data.F32[i]));
+            testStatus = false;
         }
     }
@@ -88 +94 @@
     printFooter(stdout,
                 "psFunctions functions",
-                "psSpline1DAlloc()",
+                "psSpline1DAlloc(), psVectorFitSpline1D, psSpline1DEvalVector: F32 versions",
                 testStatus);
 
@@ -94 +100 @@
 }
 
-int t00()
+// This is the F64 version of the above test code.
+int t01()
 {
     int testStatus = true;
@@ -110 +117 @@
     /****************************************************************************/
     testStatus = true;
-    x = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F32);
-    newX = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F32);
-    y = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F32);
+    x = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F64);
+    newX = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F64);
+    y = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F64);
     tmpSpline = psSpline1DAlloc(NUM_SPLINES, 3, MIN, MAX);
 
     for (i=0;i<NUM_SPLINES+1;i++) {
-        x->data.F32[i] = tmpSpline->domains[i];
-        y->data.F32[i] = myFunc(x->data.F32[i]);
+        x->data.F64[i] = tmpSpline->domains[i];
+        y->data.F64[i] = myFunc(x->data.F64[i]);
     }
 
     for (i=0;i<NUM_SPLINES;i++) {
-        newX->data.F32[i]= ((x->data.F32[i] + x->data.F32[i+1])/2.0);
+        newX->data.F64[i]= ((x->data.F64[i] + x->data.F64[i+1])/2.0);
     }
-    newX->data.F32[NUM_SPLINES] = x->data.F32[NUM_SPLINES];
+    newX->data.F64[NUM_SPLINES] = x->data.F64[NUM_SPLINES];
     /****************************************************************************/
     /*   psLib Code      */
@@ -129 +136 @@
     printPositiveTestHeader(stdout,
                             "psFunction functions",
-                            "psSpline1DAlloc()");
+                            "psSpline1DAlloc(), psVectorFitSpline1D, psSpline1DEvalVector: F64 versions");
 
     psVectorFitSpline1D(tmpSpline, x, y, NULL);
@@ -135 +142 @@
 
     for (i=OFFSET;i<NUM_SPLINES-OFFSET+1;i++) {
-        if ( fabs( newY->data.F32[i] - myFunc(newX->data.F32[i]) ) > fabs( ERROR_TOLERANCE * myFunc(newX->data.F32[i]) ) ) {
+        if ( fabs( newY->data.F32[i] - myFunc(newX->data.F64[i]) ) > fabs( ERROR_TOLERANCE * myFunc((float)newX->data.F64[i]) ) ) {
             printf("ERROR[%d]: f(%f) is %f.  Should be %f\n", i,
-                   newX->data.F32[i], newY->data.F32[i], myFunc(newX->data.F32[i]));
+                   newX->data.F64[i], newY->data.F32[i], myFunc((float)newX->data.F64[i]));
+            testStatus = false;
         }
     }
@@ -155 +163 @@
     printFooter(stdout,
                 "psFunctions functions",
-                "psSpline1DAlloc()",
+                "psSpline1DAlloc(), psVectorFitSpline1D, psSpline1DEvalVector: F64 versions",
                 testStatus);
 
@@ -164 +172 @@
 {
     t00();
+    t01();
 }