Index: trunk/psLib/test/math/tst_psFunc11.c =================================================================== --- trunk/psLib/test/math/tst_psFunc11.c (revision 5090) +++ trunk/psLib/test/math/tst_psFunc11.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 @@ -19,9 +19,9 @@ static psS32 testPoly4DEval(void); -static psS32 testPoly4DEvalVector(void); +//static psS32 testPoly4DEvalVector(void); testDescription tests[] = { - {testPoly4DEval,583,"psPolynomial4DEval",0,false}, - {testPoly4DEvalVector,000,"psPolynomial4DEvalVector",0,false}, + {testPoly4DEval,583,"psPolynomial4DEval",true,false}, + // {testPoly4DEvalVector,000,"psPolynomial4DEvalVector",true,false}, {NULL} }; @@ -374,65 +374,8 @@ } -// This test will verify operation of 1D polynomial evaluation -/*psS32 testPoly4DEval(void) -{ - psF32 result; - psF32 resultCheb; - - // Allocate polynomial structure - psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD); - psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB); - // Set polynomial members - for(psS32 i = 0; i < TERMS; i++) { - for(psS32 j = 0; j < TERMS; j++) { - for(psS32 k = 0; k < TERMS; k++) { - for(psS32 l = 0; l < TERMS; l++) { - polyOrd->coeff[i][j][k][l] = poly4DCoeff[i][j][k][l]; - polyOrd->mask[i][j][k][l] = poly4DMask[i][j][k][l]; - polyCheb->coeff[i][j][k][l] = 1.0; - polyCheb->mask[i][j][k][l] = poly4DMask[i][j][k][l]; - } - } - } - } - // Evaluate test points and verify results - for(psS32 i = 0; i < TESTPOINTS; i++) { - result = psPolynomial4DEval(polyOrd,poly4DWXYZValue[i][0],poly4DWXYZValue[i][1], - poly4DWXYZValue[i][2], poly4DWXYZValue[i][3]); - if(fabs(poly4DResult[i]-result) > ERROR_TOL ) { - psError(PS_ERR_UNKNOWN,true,"Evaluated value %g not as expected %g", - result, poly4DResult[i]); - return i; - } - resultCheb = psPolynomial4DEval(polyCheb,poly4DWXYZChebValue[i][0], poly4DWXYZChebValue[i][1], - poly4DWXYZChebValue[i][2], poly4DWXYZChebValue[i][3]); - if(fabs(poly4DChebResult[i]-resultCheb) > ERROR_TOL ) { - psError(PS_ERR_UNKNOWN,true,"Evaluated Chebyshev value %lg not as expected %lg", - resultCheb, poly4DChebResult[i]); - return 5*i; - } - } - psFree(polyOrd); - psFree(polyCheb); - - // Allocate polynomial with invalid type - polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, 99); - // Attempt to evaluation invalid polynomial type - psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); - result = psPolynomial4DEval(polyOrd,0.0, 0.0, 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; -} -*/ -// This test will verify operation of 1D polynomial evaluation +// This test will verify operation of 4D polynomial evaluation psS32 testPoly4DEval(void) { - psF64 result; - psF64 resultCheb; + psBool testStatus = true; // Allocate polynomial structure @@ -452,21 +395,24 @@ } } + // Evaluate test points and verify results for(psS32 i = 0; i < TESTPOINTS; i++) { - result = psPolynomial4DEval(polyOrd,Dpoly4DWXYZValue[i][0],Dpoly4DWXYZValue[i][1], - Dpoly4DWXYZValue[i][2],Dpoly4DWXYZValue[i][3]); + psF64 result = psPolynomial4DEval(polyOrd,Dpoly4DWXYZValue[i][0],Dpoly4DWXYZValue[i][1], + Dpoly4DWXYZValue[i][2],Dpoly4DWXYZValue[i][3]); if(fabs(Dpoly4DResult[i]-result) > ERROR_TOL ) { - psError(PS_ERR_UNKNOWN,true,"Evaluated value %lg not as expected %lg", - result, Dpoly4DResult[i]); - return i; + printf("TEST ERROR: Evaluated value %lg not as expected %lg.\n", + result, Dpoly4DResult[i]); + testStatus = false; } - resultCheb = psPolynomial4DEval(polyCheb,Dpoly4DWXYZChebValue[i][0],Dpoly4DWXYZChebValue[i][1], - Dpoly4DWXYZChebValue[i][2],Dpoly4DWXYZChebValue[i][3]); + + psF64 resultCheb = psPolynomial4DEval(polyCheb,Dpoly4DWXYZChebValue[i][0],Dpoly4DWXYZChebValue[i][1], + Dpoly4DWXYZChebValue[i][2],Dpoly4DWXYZChebValue[i][3]); if(fabs(Dpoly4DChebResult[i]-resultCheb) > ERROR_TOL ) { - psError(PS_ERR_UNKNOWN,true,"Evaluated Chebyshev value %lg not as expected %lg", - resultCheb, Dpoly4DChebResult[i]); - return 5*i; + printf("TEST ERROR: Evaluated Chebyshev value %lg not as expected %lg.\n", + resultCheb, Dpoly4DChebResult[i]); + testStatus = false; } } + psFree(polyOrd); psFree(polyCheb); @@ -476,171 +422,14 @@ // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); - result = psPolynomial4DEval(polyOrd,0.0, 0.0, 0.0, 0.0); + psF64 result = psPolynomial4DEval(polyOrd,0.0, 0.0, 0.0, 0.0); if ( !isnan(result) ) { - psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid polynomial type"); - return 20; + printf("TEST ERROR: Did not return NAN for invalid polynomial type"); + testStatus = false; } psFree(polyOrd); - return 0; + return(testStatus); } - -/*psS32 testPoly4DEvalVector(void) -{ - // Allocate polynomial - psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD); - psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB); - - // Set polynomial members - for(psS32 i = 0; i < TERMS; i++) { - for(psS32 j = 0; j < TERMS; j++) { - for(psS32 k = 0; k < TERMS; k++) { - for(psS32 l = 0; l < TERMS; l++) { - polyOrd->coeff[i][j][k][l] = poly4DCoeff[i][j][k][l]; - polyOrd->mask[i][j][k][l] = poly4DMask[i][j][k][l]; - polyCheb->coeff[i][j][k][l] = 1.0; - polyCheb->mask[i][j][k][l] = poly4DMask[i][j][k][l]; - } - } - } - } - - // Create input vectors - psVector* inputOrdW = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - psVector* inputOrdX = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - psVector* inputOrdY = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - psVector* inputOrdZ = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - psVector* inputChebW = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - psVector* inputChebX = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - psVector* inputChebY = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - psVector* inputChebZ = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); - for(psS32 i = 0; i < TESTPOINTS; i++) { - inputOrdW->data.F32[i] = poly4DWXYZValue[i][0]; - inputOrdX->data.F32[i] = poly4DWXYZValue[i][1]; - inputOrdY->data.F32[i] = poly4DWXYZValue[i][2]; - inputOrdZ->data.F32[i] = poly4DWXYZValue[i][3]; - inputChebW->data.F32[i] = poly4DWXYZChebValue[i][0]; - inputChebX->data.F32[i] = poly4DWXYZChebValue[i][1]; - inputChebY->data.F32[i] = poly4DWXYZChebValue[i][2]; - inputChebZ->data.F32[i] = poly4DWXYZChebValue[i][3]; - } - - // Evaluate the vectors - psVector* outputOrd = psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ); - 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 = psPolynomial4DEvalVector(polyCheb,inputChebW,inputChebX,inputChebY,inputChebZ); - 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(poly4DResult[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], poly4DResult[i]); - return i*5; - } - if(fabs(poly4DChebResult[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], poly4DChebResult[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(psPolynomial4DEvalVector(NULL, inputOrdW, inputOrdX, inputOrdY, inputOrdZ) != 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(psPolynomial4DEvalVector(polyOrd,NULL,inputOrdX, inputOrdY,inputOrdZ) != 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(psPolynomial4DEvalVector(polyOrd, inputOrdW, NULL, inputOrdY, inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); - return 62; - } - // Attempt to invoke function with null input vector - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector"); - if(psPolynomial4DEvalVector(polyOrd, inputOrdW, inputOrdX,NULL,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); - return 63; - } - // Attempt to invoke function with null input vector - psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector"); - if(psPolynomial4DEvalVector(polyOrd, inputOrdW, inputOrdX,inputOrdY,NULL) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); - return 64; - } - - // 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(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F32 input vector"); - return 65; - } - 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(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F32 input vector"); - return 66; - } - inputOrdY->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"); - inputOrdZ->type.type = PS_TYPE_U8; - if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F32 input vector"); - return 67; - } - inputOrdZ->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"); - inputOrdW->type.type = PS_TYPE_U8; - if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F32 input vector"); - return 68; - } - inputOrdW->type.type = PS_TYPE_F32; - - psFree(inputOrdW); - psFree(inputOrdX); - psFree(inputOrdY); - psFree(inputOrdZ); - psFree(inputChebW); - psFree(inputChebX); - psFree(inputChebY); - psFree(inputChebZ); - psFree(outputOrd); - psFree(outputCheb); - psFree(polyOrd); - psFree(polyCheb); - - return 0; -} -*/ +/* psS32 testPoly4DEvalVector(void) { @@ -648,5 +437,5 @@ psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_ORD); psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS-1, TERMS-1, TERMS-1, TERMS-1, PS_POLYNOMIAL_CHEB); - + // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -662,5 +451,5 @@ } } - + // Create input vectors psVector* inputOrdW = psVectorAlloc(TESTPOINTS, PS_TYPE_F64); @@ -682,79 +471,79 @@ inputChebZ->data.F64[i] = Dpoly4DWXYZChebValue[i][3]; } - + // Evaluate the vectors psVector* outputOrd = psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ); if(outputOrd == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); - return 1; + printf("TEST ERROR: Unexpected return of NULL."); + testStatus = false; } if(outputOrd->type.type != PS_TYPE_F64) { - psError(PS_ERR_UNKNOWN,true,"Output vector of type %d expected %d", + printf("TEST ERROR: Output vector of type %d expected %d", outputOrd->type.type, PS_TYPE_F64); - return 2; + testStatus = false; } psVector* outputCheb = psPolynomial4DEvalVector(polyCheb,inputChebW,inputChebX,inputChebY,inputChebZ); if(outputCheb == NULL) { - psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); - return 1; + printf("TEST ERROR: Unexpected return of NULL."); + testStatus = false; } if(outputCheb->type.type != PS_TYPE_F64) { - psError(PS_ERR_UNKNOWN,true,"Output vector of type %d expected %d", + printf("TEST ERROR: Output vector of type %d expected %d", outputCheb->type.type, PS_TYPE_F64); - return 2; - } - + testStatus = false; + } + // Verify the results for(psS32 i = 0; i < TESTPOINTS; i++) { if(fabs(Dpoly4DResult[i]-outputOrd->data.F64[i]) > ERROR_TOL) { - psError(PS_ERR_UNKNOWN,true,"Result[%d] %lg not equal to expected %lg", + printf("TEST ERROR: Result[%d] %lg not equal to expected %lg", i, outputOrd->data.F64[i], Dpoly4DResult[i]); - return i*5; + testStatus = false; } if(fabs(Dpoly4DChebResult[i]-outputCheb->data.F64[i]) > ERROR_TOL) { - psError(PS_ERR_UNKNOWN,true,"ResultCheb[%d] %lg not equal to expected %lg", + printf("TEST ERROR: ResultCheb[%d] %lg not equal to expected %lg", i, outputCheb->data.F64[i], Dpoly4DChebResult[i]); - return i*10; + testStatus = false; } } - + // Attempt to invoke function with null polynomial psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial"); if(psPolynomial4DEvalVector(NULL,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != 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"); + 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(psPolynomial4DEvalVector(polyOrd,NULL,inputOrdX,inputOrdY,inputOrdZ) != 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"); + 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(psPolynomial4DEvalVector(polyOrd,inputOrdW,NULL,inputOrdY,inputOrdZ) != 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"); + 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(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,NULL,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); - return 63; + printf("TEST ERROR: Return of NULL expected for NULL input vector"); + 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(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,NULL) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); - return 64; - } - + printf("TEST ERROR: Return of NULL expected for NULL input vector"); + testStatus = false; + } + // Attempt to invoke function with a non F64 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(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); - return 65; + printf("TEST ERROR: Return NULL expected for non-F64 input vector"); + testStatus = false; } inputOrdX->type.type = PS_TYPE_F64; @@ -763,6 +552,6 @@ inputOrdY->type.type = PS_TYPE_U8; if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); - return 66; + printf("TEST ERROR: Return NULL expected for non-F64 input vector"); + testStatus = false; } inputOrdY->type.type = PS_TYPE_F64; @@ -771,6 +560,6 @@ inputOrdZ->type.type = PS_TYPE_U8; if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); - return 67; + printf("TEST ERROR: Return NULL expected for non-F64 input vector"); + testStatus = false; } inputOrdZ->type.type = PS_TYPE_F64; @@ -779,9 +568,9 @@ inputOrdW->type.type = PS_TYPE_U8; if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { - psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); - return 68; + printf("TEST ERROR: Return NULL expected for non-F64 input vector"); + testStatus = false; } inputOrdW->type.type = PS_TYPE_F64; - + psFree(inputOrdX); psFree(inputOrdY); @@ -796,6 +585,7 @@ psFree(polyOrd); psFree(polyCheb); - - return 0; + + return(testStatus); } - + +*/