Index: trunk/psLib/test/math/tst_psFunc10.c =================================================================== --- trunk/psLib/test/math/tst_psFunc10.c (revision 4547) +++ trunk/psLib/test/math/tst_psFunc10.c (revision 4581) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-13 02:47:00 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-20 01:21:13 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -19,13 +19,9 @@ static psS32 testPoly3DEval(void); -static psS32 testDPoly3DEval(void); static psS32 testPoly3DEvalVector(void); -static psS32 testDPoly3DEvalVector(void); testDescription tests[] = { {testPoly3DEval,583,"psPolynomial3DEval",0,false}, - {testDPoly3DEval,582,"psDPolynomial3DEval",0,false}, {testPoly3DEvalVector,000,"psPolynomial3DEvalVector",0,false}, - {testDPoly3DEvalVector,000,"psDPolynomial3DEvalVector",0,false}, {NULL} }; @@ -136,9 +132,9 @@ // This test will verify operation of 1D polynomial evaluation -psS32 testPoly3DEval(void) +/*psS32 testPoly3DEval(void) { psF32 result; psF32 resultCheb; - + // Allocate polynomial structure psPolynomial3D* polyOrd = psPolynomial3DAlloc(TERMS, TERMS, TERMS, PS_POLYNOMIAL_ORD); @@ -174,5 +170,5 @@ psFree(polyOrd); psFree(polyCheb); - + // Allocate polynomial with invalid type polyOrd = psPolynomial3DAlloc(TERMS, TERMS, TERMS, 99); @@ -185,10 +181,10 @@ } psFree(polyOrd); - + return 0; } - +*/ // This test will verify operation of 1D polynomial evaluation -psS32 testDPoly3DEval(void) +psS32 testPoly3DEval(void) { psF64 result; @@ -196,6 +192,6 @@ // Allocate polynomial structure - psDPolynomial3D* polyOrd = psDPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); - psDPolynomial3D* polyCheb = psDPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); + psPolynomial3D* polyOrd = psPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); + psPolynomial3D* polyCheb = psPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -211,6 +207,6 @@ // Evaluate test points and verify results for(psS32 i = 0; i < TESTPOINTS; i++) { - result = psDPolynomial3DEval(polyOrd,Dpoly3DXYZValue[i][0],Dpoly3DXYZValue[i][1], - Dpoly3DXYZValue[i][2]); + result = psPolynomial3DEval(polyOrd,Dpoly3DXYZValue[i][0],Dpoly3DXYZValue[i][1], + Dpoly3DXYZValue[i][2]); if(fabs(Dpoly3DResult[i]-result) > ERROR_TOL ) { psError(PS_ERR_UNKNOWN,true,"Evaluated value %lg not as expected %lg", @@ -218,6 +214,6 @@ return i; } - resultCheb = psDPolynomial3DEval(polyCheb,Dpoly3DXYZChebValue[i][0],Dpoly3DXYZChebValue[i][1], - Dpoly3DXYZChebValue[i][2]); + resultCheb = psPolynomial3DEval(polyCheb,Dpoly3DXYZChebValue[i][0],Dpoly3DXYZChebValue[i][1], + Dpoly3DXYZChebValue[i][2]); if(fabs(Dpoly3DChebResult[i]-resultCheb) > ERROR_TOL ) { psError(PS_ERR_UNKNOWN,true,"Evaluated Chebyshev value %lg not as expected %lg", @@ -230,8 +226,8 @@ // Allocate polynomial with invalid type - polyOrd = psDPolynomial3DAlloc(TERMS, TERMS, TERMS, 99); + polyOrd = psPolynomial3DAlloc(TERMS, TERMS, TERMS, 99); // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); - result = psDPolynomial3DEval(polyOrd,0.0, 0.0, 0.0); + result = psPolynomial3DEval(polyOrd,0.0, 0.0, 0.0); if ( !isnan(result) ) { psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid polynomial type"); @@ -243,10 +239,10 @@ } -psS32 testPoly3DEvalVector(void) +/*psS32 testPoly3DEvalVector(void) { // Allocate polynomial psPolynomial3D* polyOrd = psPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); psPolynomial3D* polyCheb = psPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); - + // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -260,5 +256,5 @@ } } - + // Create input vectors psVector* inputOrdX = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); @@ -276,5 +272,5 @@ inputChebZ->data.F32[i] = poly3DXYZChebValue[i][2]; } - + // Evaluate the vectors psVector* outputOrd = psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ); @@ -298,5 +294,5 @@ return 2; } - + // Verify the results for(psS32 i = 0; i < TESTPOINTS; i++) { @@ -312,5 +308,5 @@ } } - + // Attempt to invoke function with null polynomial psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial"); @@ -319,5 +315,5 @@ 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"); @@ -338,5 +334,5 @@ return 63; } - + // 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"); @@ -363,5 +359,5 @@ } inputOrdZ->type.type = PS_TYPE_F32; - + psFree(inputOrdX); psFree(inputOrdY); @@ -374,13 +370,13 @@ psFree(polyOrd); psFree(polyCheb); - + return 0; } - -psS32 testDPoly3DEvalVector(void) +*/ +psS32 testPoly3DEvalVector(void) { // Allocate polynomial - psDPolynomial3D* polyOrd = psDPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); - psDPolynomial3D* polyCheb = psDPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); + psPolynomial3D* polyOrd = psPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); + psPolynomial3D* polyCheb = psPolynomial3DAlloc(TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); // Set polynomial members @@ -413,5 +409,5 @@ // Evaluate the vectors - psVector* outputOrd = psDPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ); + psVector* outputOrd = psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ); if(outputOrd == NULL) { psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); @@ -423,5 +419,5 @@ return 2; } - psVector* outputCheb = psDPolynomial3DEvalVector(polyCheb,inputChebX,inputChebY,inputChebZ); + psVector* outputCheb = psPolynomial3DEvalVector(polyCheb,inputChebX,inputChebY,inputChebZ); if(outputCheb == NULL) { psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); @@ -450,5 +446,5 @@ // Attempt to invoke function with null polynomial psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial"); - if(psDPolynomial3DEvalVector(NULL,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial3DEvalVector(NULL,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL polynomial"); return 60; @@ -457,5 +453,5 @@ // Attempt to invoke function with null input vector psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector"); - if(psDPolynomial3DEvalVector(polyOrd,NULL,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial3DEvalVector(polyOrd,NULL,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 61; @@ -463,5 +459,5 @@ // Attempt to invoke function with null input vector psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector"); - if(psDPolynomial3DEvalVector(polyOrd,inputOrdX,NULL,inputOrdZ) != NULL) { + if(psPolynomial3DEvalVector(polyOrd,inputOrdX,NULL,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 62; @@ -469,5 +465,5 @@ // Attempt to invoke function with null input vector psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL input vector"); - if(psDPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,NULL) != NULL) { + if(psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,NULL) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 63; @@ -477,5 +473,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdX->type.type = PS_TYPE_U8; - if(psDPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 64; @@ -485,5 +481,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdY->type.type = PS_TYPE_U8; - if(psDPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 65; @@ -493,5 +489,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdZ->type.type = PS_TYPE_U8; - if(psDPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial3DEvalVector(polyOrd,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 66;