Changeset 4580 for trunk/psLib/test/math/tst_psFunc07.c

Timestamp:

Jul 18, 2005, 4:55:54 PM (21 years ago)

Author:

gusciora

Message:

New version of spline fit functions in the SDRS.

File:

• trunk/psLib/test/math/tst_psFunc07.c (modified) (7 diffs)

trunk/psLib/test/math/tst_psFunc07.c

@@ -9 +9 @@
 XXX: The spline eval functions are F32 only, while the spline fit functions
 are F32 and F64.
+ 
+XXX: Must call the spline fit functions with unallowable input parameters.
  *****************************************************************************/
 #include <stdio.h>
@@ -17 +19 @@
 #include "psFunctions.h"
 
+#define VERBOSE 0
 #define NUM_SPLINES 50
 #define A 4.0
@@ -51 +54 @@
     newX = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F32);
     y = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F32);
-    tmpSpline = psSpline1DAlloc(NUM_SPLINES, 3, MIN, MAX);
+
+
+    psF32 width = (MAX - MIN) / ((psF32) NUM_SPLINES);
+    x->data.F32[0] = MIN;
+    for (psS32 i=1;i<NUM_SPLINES;i++) {
+        x->data.F32[i] = MIN + (width * (psF32) i);
+    }
+    x->data.F32[NUM_SPLINES] = MAX;
 
     for (i=0;i<NUM_SPLINES+1;i++) {
-        x->data.F32[i] = tmpSpline->knots->data.F32[i];
         y->data.F32[i] = myFunc(x->data.F32[i]);
     }
@@ -69 +78 @@
                             "psSpline1DAlloc(), psVectorFitSpline1D, psSpline1DEvalVector: F32 versions");
 
-    psVectorFitSpline1D(tmpSpline, x, y, NULL);
-    newY = psSpline1DEvalVector(
-               tmpSpline,
-               newX
-           );
-
-    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]) ) ) {
-            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;
+    tmpSpline = psVectorFitSpline1DNEW(x, y, NUM_SPLINES);
+    if (tmpSpline == NULL) {
+        printf("TEST ERROR: psVectorFitSpline1DNEW() returned NULL.\n");
+        testStatus = false;
+    } else {
+        newY = psSpline1DEvalVector(tmpSpline, newX);
+
+        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]) ) ) {
+                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;
+            } else {
+                if (VERBOSE) {
+                    printf("COOL[%d]: f(%f) is %f.  Should be %f\n", i,
+                           newX->data.F32[i], newY->data.F32[i], myFunc(newX->data.F32[i]));
+                }
+            }
         }
-    }
-
+        psFree(tmpSpline);
+        psFree(newY);
+    }
     psFree(x);
+    psFree(y);
     psFree(newX);
-    psFree(y);
-    psFree(tmpSpline);
-    psFree(newY);
 
     psMemCheckCorruption(1);
@@ -123 +138 @@
     newX = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F64);
     y = psVectorAlloc(NUM_SPLINES+1, PS_TYPE_F64);
-    tmpSpline = psSpline1DAlloc(NUM_SPLINES, 3, MIN, MAX);
+
+    psF64 width = (MAX - MIN) / ((psF32) NUM_SPLINES);
+    x->data.F64[0] = MIN;
+    for (psS32 i=1;i<NUM_SPLINES;i++) {
+        x->data.F64[i] = MIN + (width * (psF64) i);
+    }
+    x->data.F64[NUM_SPLINES] = MAX;
 
     for (i=0;i<NUM_SPLINES+1;i++) {
-        x->data.F64[i] = tmpSpline->knots->data.F32[i];
         y->data.F64[i] = myFunc(x->data.F64[i]);
     }
@@ -141 +161 @@
                             "psSpline1DAlloc(), psVectorFitSpline1D, psSpline1DEvalVector: F64 versions");
 
-    psVectorFitSpline1D(tmpSpline, x, y, NULL);
-    newY = psSpline1DEvalVector(
-               tmpSpline,
-               newX
-           );
-
-    for (i=OFFSET;i<NUM_SPLINES-OFFSET+1;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.F64[i], newY->data.F32[i], myFunc((float)newX->data.F64[i]));
-            testStatus = false;
+    tmpSpline = psVectorFitSpline1DNEW(x, y, NUM_SPLINES);
+    if (tmpSpline == NULL) {
+        printf("TEST ERROR: psVectorFitSpline1DNEW() returned NULL.\n");
+        testStatus = false;
+    } else {
+        newY = psSpline1DEvalVector(tmpSpline, newX);
+
+        for (i=OFFSET;i<NUM_SPLINES-OFFSET+1;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.F64[i], newY->data.F32[i], myFunc((float)newX->data.F64[i]));
+                testStatus = false;
+            } else {
+                if (VERBOSE) {
+                    printf("COOL[%d]: f(%f) is %f.  Should be %f\n", i,
+                           newX->data.F64[i], newY->data.F32[i], myFunc((float)newX->data.F64[i]));
+                }
+            }
         }
-    }
-
+        psFree(tmpSpline);
+        psFree(newY);
+    }
     psFree(x);
     psFree(newX);
     psFree(y);
-    psFree(tmpSpline);
-    psFree(newY);
 
     psMemCheckCorruption(1);
@@ -177 +203 @@
 psS32 main()
 {
-    //    t00();
+    psLogSetFormat("HLNM");
+    t00();
     t01();
 }