Index: trunk/psLib/test/math/tst_psFunc09.c
===================================================================
--- trunk/psLib/test/math/tst_psFunc09.c	(revision 5090)
+++ trunk/psLib/test/math/tst_psFunc09.c	(revision 5092)
@@ -4,6 +4,6 @@
 *  ORD and CHEB type polynomials.
 *
-*  @version  $Revision: 1.4 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-09-22 02:47:16 $
+*  @version  $Revision: 1.5 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-09-22 20:45:43 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -22,6 +22,6 @@
 
 testDescription tests[] = {
-                              {testPoly2DEval,583,"psPolynomial2DEval",0,false},
-                              {testPoly2DEvalVector,000,"psPolynomial2DEvalVector",0,false},
+                              {testPoly2DEval,583,"psPolynomial2DEval",true,false},
+                              {testPoly2DEvalVector,000,"psPolynomial2DEvalVector",true,false},
                               {NULL}
                           };
@@ -82,9 +82,10 @@
 
 // This test will verify operation of 1D polynomial evaluation
-/*psS32 testPoly2DEval(void)
+psS32 testPoly2DEval(void)
 {
-    psF32  result;
-    psF32  resultCheb;
- 
+    psF64  result;
+    psF64  resultCheb;
+    psBool testStatus = true;
+
     // Allocate polynomial structure
     psPolynomial2D*  polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD);
@@ -101,20 +102,18 @@
     // Evaluate test points and verify results
     for(psS32 i = 0; i < TESTPOINTS; i++) {
-        result = psPolynomial2DEval(polyOrd,poly2DXYValue[i][0],poly2DXYValue[i][1]);
-        if(fabs(poly2DResult[i]-result) > ERROR_TOL ) {
-            psError(PS_ERR_UNKNOWN,true,"Evaluated value %g not as expected %g",
-                    result, poly2DResult[i]);
-            return i;
-        }
-        resultCheb = psPolynomial2DEval(polyCheb,poly2DXYChebValue[i][0], poly2DXYChebValue[i][1]);
-        if(fabs(poly2DChebResult[i]-resultCheb) > ERROR_TOL ) {
-            psError(PS_ERR_UNKNOWN,true,"Evaluated Chebyshev value %lg not as expected %lg",
-                    resultCheb, poly2DChebResult[i]);
-            return 5*i;
+        result = psPolynomial2DEval(polyOrd,Dpoly2DXYValue[i][0],Dpoly2DXYValue[i][1]);
+        if(fabs(Dpoly2DResult[i]-result) > ERROR_TOL ) {
+            printf("TEST ERROR: Evaluated value %f, should be %f\n", result, Dpoly2DResult[i]);
+            testStatus = false;
+        }
+        resultCheb = psPolynomial2DEval(polyCheb,Dpoly2DXYChebValue[i][0],Dpoly2DXYChebValue[i][1]);
+        if(fabs(Dpoly2DChebResult[i]-resultCheb) > ERROR_TOL ) {
+            printf("TEST ERROR: Evaluated value %f, should be %f\n", resultCheb, Dpoly2DChebResult[i]);
+            testStatus = false;
         }
     }
     psFree(polyOrd);
     psFree(polyCheb);
- 
+
     // Allocate polynomial with invalid type
     polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, 99);
@@ -124,176 +123,14 @@
     if ( !isnan(result) ) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid polynomial type");
-        return 20;
+        testStatus = false;
     }
     psFree(polyOrd);
- 
-    return 0;
+
+    return(testStatus);
 }
-*/
-// This test will verify operation of 1D polynomial evaluation
-psS32 testPoly2DEval(void)
-{
-    psF64  result;
-    psF64  resultCheb;
-
-    // Allocate polynomial structure
-    psPolynomial2D*  polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD);
-    psPolynomial2D*  polyCheb = psPolynomial2DAlloc(TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB);
-    // Set polynomial members
-    for(psS32 i = 0; i < TERMS; i++) {
-        for(psS32 j = 0; j < TERMS; j++) {
-            polyOrd->coeff[i][j] = poly2DCoeff[i][j];
-            polyOrd->mask[i][j]  = poly2DMask[i][j];
-            polyCheb->coeff[i][j] = 1.0;
-            polyCheb->mask[i][j]  = poly2DMask[i][j];
-        }
-    }
-    // Evaluate test points and verify results
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-        result = psPolynomial2DEval(polyOrd,Dpoly2DXYValue[i][0],Dpoly2DXYValue[i][1]);
-        if(fabs(Dpoly2DResult[i]-result) > ERROR_TOL ) {
-            psError(PS_ERR_UNKNOWN,true,"Evaluated value %lg not as expected %lg",
-                    result, Dpoly2DResult[i]);
-            return i;
-        }
-        resultCheb = psPolynomial2DEval(polyCheb,Dpoly2DXYChebValue[i][0],Dpoly2DXYChebValue[i][1]);
-        if(fabs(Dpoly2DChebResult[i]-resultCheb) > ERROR_TOL ) {
-            psError(PS_ERR_UNKNOWN,true,"Evaluated Chebyshev value %lg not as expected %lg",
-                    resultCheb, Dpoly2DChebResult[i]);
-            return 5*i;
-        }
-    }
-    psFree(polyOrd);
-    psFree(polyCheb);
-
-    // Allocate polynomial with invalid type
-    polyOrd = psPolynomial2DAlloc(TERMS-1, TERMS-1, 99);
-    // Attempt to evaluation invalid polynomial type
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type");
-    result = psPolynomial2DEval(polyOrd,0.0, 0.0);
-    if ( !isnan(result) ) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid polynomial type");
-        return 20;
-    }
-    psFree(polyOrd);
-
-    return 0;
-}
-
-/*psS32 testPoly2DEvalVector(void)
-{
-    // Allocate polynomial
-    psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS-1,TERMS-1,PS_POLYNOMIAL_ORD);
-    psPolynomial2D* polyCheb = psPolynomial2DAlloc(TERMS-1,TERMS-1,PS_POLYNOMIAL_CHEB);
- 
-    // Set polynomial members
-    for(psS32 i = 0; i < TERMS; i++) {
-        for(psS32 j = 0; j < TERMS; j++) {
-            polyOrd->coeff[i][j] = poly2DCoeff[i][j];
-            polyOrd->mask[i][j]  = poly2DMask[i][j];
-            polyCheb->coeff[i][j] = 1.0;
-            polyCheb->mask[i][j]  = poly2DMask[i][j];
-        }
-    }
- 
-    // Create input vectors
-    psVector* inputOrdX  = psVectorAlloc(TESTPOINTS, PS_TYPE_F32);
-    psVector* inputOrdY  = psVectorAlloc(TESTPOINTS, PS_TYPE_F32);
-    psVector* inputChebX = psVectorAlloc(TESTPOINTS, PS_TYPE_F32);
-    psVector* inputChebY = psVectorAlloc(TESTPOINTS, PS_TYPE_F32);
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-        inputOrdX->data.F32[i] = poly2DXYValue[i][0];
-        inputOrdY->data.F32[i] = poly2DXYValue[i][1];
-        inputChebX->data.F32[i] = poly2DXYChebValue[i][0];
-        inputChebY->data.F32[i] = poly2DXYChebValue[i][1];
-    }
- 
-    // Evaluate the vectors
-    psVector* outputOrd = psPolynomial2DEvalVector(polyOrd, inputOrdX, inputOrdY);
-    if(outputOrd == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL.");
-        return 1;
-    }
-    if(outputOrd->type.type != PS_TYPE_F32) {
-        psError(PS_ERR_UNKNOWN,true,"Output vector of type %d expected %d",
-                outputOrd->type.type, PS_TYPE_F32);
-        return 2;
-    }
-    psVector* outputCheb = psPolynomial2DEvalVector(polyCheb, inputChebX, inputChebY);
-    if(outputCheb == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL.");
-        return 1;
-    }
-    if(outputCheb->type.type != PS_TYPE_F32) {
-        psError(PS_ERR_UNKNOWN,true,"Output vector of type %d expected %d",
-                outputCheb->type.type, PS_TYPE_F32);
-        return 2;
-    }
- 
-    // Verify the results
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-        if(fabs(poly2DResult[i]-outputOrd->data.F32[i]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Result[%d] %g not equal to expected %g",
-                    i, outputOrd->data.F32[i], poly2DResult[i]);
-            return i*5;
-        }
-        if(fabs(poly2DChebResult[i]-outputCheb->data.F32[i]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"ResultCheb[%d] %g not equal to expected %g",
-                    i, outputCheb->data.F32[i], poly2DChebResult[i]);
-            return i*10;
-        }
-    }
- 
-    // Attempt to invoke function with null polynomial
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial");
-    if(psPolynomial2DEvalVector(NULL, inputOrdX, inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL polynomial");
-        return 60;
-    }
- 
-    // Attempt to invoke function with null input vector
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector");
-    if(psPolynomial2DEvalVector(polyOrd,NULL, inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector");
-        return 61;
-    }
-    // Attempt to invoke function with null input vector
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector");
-    if(psPolynomial2DEvalVector(polyOrd, inputOrdX, NULL) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector");
-        return 62;
-    }
- 
-    // Attempt to invoke function with a non F32 type input vector
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type");
-    inputOrdX->type.type = PS_TYPE_U8;
-    if(psPolynomial2DEvalVector(polyOrd,inputOrdX,inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F32 input vector");
-        return 63;
-    }
-    inputOrdX->type.type = PS_TYPE_F32;
-    // Attempt to invoke function with a non F32 type input vector
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type");
-    inputOrdY->type.type = PS_TYPE_U8;
-    if(psPolynomial2DEvalVector(polyOrd,inputOrdX,inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F32 input vector");
-        return 64;
-    }
-    inputOrdY->type.type = PS_TYPE_F32;
- 
-    psFree(inputOrdX);
-    psFree(inputOrdY);
-    psFree(inputChebX);
-    psFree(inputChebY);
-    psFree(outputOrd);
-    psFree(outputCheb);
-    psFree(polyOrd);
-    psFree(polyCheb);
- 
-    return 0;
-}
-*/
+
 psS32 testPoly2DEvalVector(void)
 {
+    psBool testStatus = true;
     // Allocate polynomial
     psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS-1,TERMS-1,PS_POLYNOMIAL_ORD);
@@ -325,21 +162,19 @@
     psVector* outputOrd = psPolynomial2DEvalVector(polyOrd, inputOrdX, inputOrdY);
     if(outputOrd == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL.");
-        return 1;
+        printf("TEST ERROR: Unexpected return of NULL.\n");
+        testStatus = false;
     }
     if(outputOrd->type.type != PS_TYPE_F64) {
-        psError(PS_ERR_UNKNOWN,true,"Output vector of type %d expected %d",
-                outputOrd->type.type, PS_TYPE_F64);
-        return 2;
+        printf("TEST ERROR: Output vector of type %d expected %d\n", outputOrd->type.type, PS_TYPE_F64);
+        testStatus = false;
     }
     psVector* outputCheb = psPolynomial2DEvalVector(polyCheb, inputChebX, inputChebY);
     if(outputCheb == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL.");
-        return 1;
+        printf("TEST ERROR: Unexpected return of NULL.\n");
+        testStatus = false;
     }
     if(outputCheb->type.type != PS_TYPE_F64) {
-        psError(PS_ERR_UNKNOWN,true,"Output vector of type %d expected %d",
-                outputCheb->type.type, PS_TYPE_F64);
-        return 2;
+        printf("TEST ERROR: Output vector of type %d expected %d.\n", outputCheb->type.type, PS_TYPE_F64);
+        testStatus = false;
     }
 
@@ -347,12 +182,12 @@
     for(psS32 i = 0; i < TESTPOINTS; i++) {
         if(fabs(poly2DResult[i]-outputOrd->data.F64[i]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Result[%d] %lg not equal to expected %lg",
-                    i, outputOrd->data.F64[i], poly2DResult[i]);
-            return i*5;
+            printf("TEST ERROR: Result[%d] %lg not equal to expected %lg.\n",
+                   i, outputOrd->data.F64[i], poly2DResult[i]);
+            testStatus = false;
         }
         if(fabs(poly2DChebResult[i]-outputCheb->data.F64[i]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"ResultCheb[%d] %lg not equal to expected %lg",
-                    i, outputCheb->data.F64[i], poly2DChebResult[i]);
-            return i*10;
+            printf("TEST ERROR: ResultCheb[%d] %lg not equal to expected %lg.\n",
+                   i, outputCheb->data.F64[i], poly2DChebResult[i]);
+            testStatus = false;
         }
     }
@@ -361,6 +196,6 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial");
     if(psPolynomial2DEvalVector(NULL, inputOrdX, inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL polynomial");
-        return 60;
+        printf("TEST ERROR: Return of NULL expected for NULL polynomial.\n");
+        testStatus = false;
     }
 
@@ -368,12 +203,12 @@
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector");
     if(psPolynomial2DEvalVector(polyOrd,NULL,inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector");
-        return 61;
+        printf("TEST ERROR: Return of NULL expected for NULL input vector.\n");
+        testStatus = false;
     }
     // Attempt to invoke function with null input vector
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector");
     if(psPolynomial2DEvalVector(polyOrd,inputOrdX,NULL) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector");
-        return 62;
+        printf("TEST ERROR: Return of NULL expected for NULL input vector.\n");
+        testStatus = false;
     }
 
@@ -382,6 +217,6 @@
     inputOrdX->type.type = PS_TYPE_U8;
     if(psPolynomial2DEvalVector(polyOrd,inputOrdX, inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector");
-        return 63;
+        printf("TEST ERROR: Return NULL expected for non-F64 input vector.\n");
+        testStatus = false;
     }
     inputOrdX->type.type = PS_TYPE_F64;
@@ -390,6 +225,6 @@
     inputOrdY->type.type = PS_TYPE_U8;
     if(psPolynomial2DEvalVector(polyOrd,inputOrdX, inputOrdY) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector");
-        return 64;
+        printf("TEST ERROR: Return NULL expected for non-F64 input vector.\n");
+        testStatus = false;
     }
     inputOrdY->type.type = PS_TYPE_F64;
@@ -404,5 +239,5 @@
     psFree(polyCheb);
 
-    return 0;
+    return(testStatus);
 }