Index: trunk/psLib/test/math/tst_psSpline1D.c
===================================================================
--- trunk/psLib/test/math/tst_psSpline1D.c	(revision 5183)
+++ trunk/psLib/test/math/tst_psSpline1D.c	(revision 5546)
@@ -13,6 +13,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-29 20:25:54 $
+*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-11-18 20:04:38 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -126,7 +126,35 @@
 
 /*********************************************************************************
-psSplineEvalTest_sub00(): We test the psVectorFitSpline1D, psSpline1DEval() functions with a very
-simple x->y mapping (defined by myFunc00() below).  We do this for both F32
-and F64 versions of the input x and y vectors.
+psSplineEvalTest_sub(): We psVectorFitSpline1D with NULL arguments. psSpline1DEval()
+ ********************************************************************************/
+psS32 psSplineEvalTest_sub(psS32 NumSplines)
+{
+    psS32 testStatus = true;
+    psS32 memLeaks=0;
+    psS32  currentId = psMemGetId();
+
+    printf("\n");
+    printf("Calling psVectorFitSpline1D() with NULL y-vector.  Should generate error.\n");
+    psSpline1D *tmpSpline = psVectorFitSpline1D(NULL, NULL);
+    if (tmpSpline != NULL) {
+        printf("TEST ERROR: psVectorFitSpline1D() did not return NULL.\n");
+        testStatus = false;
+        psFree(tmpSpline);
+    }
+
+    psMemCheckCorruption(1);
+    memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false);
+    if (0 != memLeaks) {
+        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
+    }
+
+    return (testStatus);
+}
+
+
+/*********************************************************************************
+psSplineEvalTest_sub00(): We test the psVectorFitSpline1D, psSpline1DEval()
+functions with a very simple x->y mapping (defined by myFunc00() below).  We
+do this for both F32 and F64 versions of the input x and y vectors.
  ********************************************************************************/
 psF32 myFunc00(psF32 x)
@@ -149,19 +177,12 @@
 
     printf("\n");
-    printf("Calling psVectorFitSpline1D() with NULL y-vector.  Should generate error.\n");
-    tmpSpline = psVectorFitSpline1D(NULL, NULL);
-    if (tmpSpline != NULL) {
-        printf("TEST ERROR: psVectorFitSpline1D() did not return NULL.\n");
-        testStatus = false;
-        psFree(tmpSpline);
-    }
-
-    printf("\n");
     printf("psSplineEvalTest_sub00(): We test the psVectorFitSpline1D, psSpline1DEval() functions with a very\n");
     printf("simple x->y mapping (defined by myFunc00()).  We do this for both F32\n");
     printf("and F64 versions of the input x and y vectors.\n");
+    printf("    Number of splines: %d\n", NumSplines);
     /****************************************************************************/
     /*    PS_TYPE_F32, PS_TYPE_F32 test          */
     /****************************************************************************/
+    printf("Performing the F32 test....\n");
     xF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
     xF64 = psVectorAlloc(NumSplines+1, PS_TYPE_F64);
@@ -239,4 +260,5 @@
     /*    PS_TYPE_F64, PS_TYPE_F64 test          */
     /****************************************************************************/
+    printf("Performing the F64 test....\n");
     xF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
     xF64 = psVectorAlloc(NumSplines+1, PS_TYPE_F64);
@@ -314,7 +336,7 @@
 
 /*********************************************************************************
-psSplineEvalTest_sub00b(): We test the psVectorFitSpline1D, psSpline1DEval() functions with a
-more complicated x->y mapping (defined by myFunc00b() below).  We do this for
-both F32 and F64 versions of the input x and y vectors.
+psSplineEvalTest_sub00b(): We test the psVectorFitSpline1D, psSpline1DEval()
+functions with a more complicated x->y mapping (defined by myFunc00b() below).
+We do this for both F32 and F64 versions of the input x and y vectors.
  ********************************************************************************/
 #define A 4.0
@@ -333,4 +355,5 @@
     printf("more complicated x->y mapping (defined by myFunc00b()).  We do this for\n");
     printf("both F32 and F64 versions of the input x and y vectors.\n");
+    printf("    Number of splines: %d\n", NumSplines);
     psS32 testStatus = true;
     psS32 memLeaks=0;
@@ -347,4 +370,5 @@
     /*    PS_TYPE_F32, PS_TYPE_F32 test          */
     /****************************************************************************/
+    printf("Performing the F32 test....\n");
     xF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
     xF64 = psVectorAlloc(NumSplines+1, PS_TYPE_F64);
@@ -421,4 +445,5 @@
     /*    PS_TYPE_F64, PS_TYPE_F64 test          */
     /****************************************************************************/
+    printf("Performing the F64 test....\n");
     xF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
     xF64 = psVectorAlloc(NumSplines+1, PS_TYPE_F64);
@@ -496,4 +521,8 @@
 
 
+/*********************************************************************************
+psSplineEvalTest_sub00b():  This is similar to psSplineEvalTest_sub00b()
+except that the x vector is NULL.
+ ********************************************************************************/
 psS32 psSplineEvalTest_sub00c(psS32 NumSplines)
 {
@@ -501,4 +530,5 @@
     printf("psSplineEvalTest_sub00c(): This is similar to psSplineEvalTest_sub00b()\n");
     printf("except that the x vector is NULL.\n");
+    printf("    Number of splines: %d\n", NumSplines);
     psS32 testStatus = true;
     psS32 memLeaks=0;
@@ -515,4 +545,5 @@
     /*    PS_TYPE_F32, PS_TYPE_F32 test          */
     /****************************************************************************/
+    printf("Performing the F32 test....\n");
     xF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
     xF64 = psVectorAlloc(NumSplines+1, PS_TYPE_F64);
@@ -589,4 +620,5 @@
     /*    PS_TYPE_F64, PS_TYPE_F64 test          */
     /****************************************************************************/
+    printf("Performing the F64 test....\n");
     xF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
     xF64 = psVectorAlloc(NumSplines+1, PS_TYPE_F64);
@@ -678,5 +710,20 @@
     psTraceSetLevel("psSpline1DEvalVector", 0);
 
-    return(psSplineEvalTest_sub00(95) & psSplineEvalTest_sub00b(95) & psSplineEvalTest_sub00c(95));
+    psS32 testStatus = psSplineEvalTest_sub(10);
+
+    // HEY
+    testStatus |= psSplineEvalTest_sub00(0);
+    testStatus |= psSplineEvalTest_sub00b(0);
+    testStatus |= psSplineEvalTest_sub00c(0);
+
+    testStatus |= psSplineEvalTest_sub00(1);
+    testStatus |= psSplineEvalTest_sub00b(1);
+    testStatus |= psSplineEvalTest_sub00c(1);
+
+    testStatus |= psSplineEvalTest_sub00(95);
+    testStatus |= psSplineEvalTest_sub00b(95);
+    testStatus |= psSplineEvalTest_sub00c(95);
+
+    return(testStatus);
 }
 
@@ -695,4 +742,5 @@
     /*    PS_TYPE_F32, PS_TYPE_F32 test          */
     /****************************************************************************/
+    printf("Performing the F32 test....\n");
     xF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
     yF32 = psVectorAlloc(NumSplines+1, PS_TYPE_F32);
@@ -806,2 +854,3 @@
 
 
+// This code will