Index: trunk/psLib/test/math/tst_psFunc09.c =================================================================== --- trunk/psLib/test/math/tst_psFunc09.c (revision 4547) +++ trunk/psLib/test/math/tst_psFunc09.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 testPoly2DEval(void); -static psS32 testDPoly2DEval(void); static psS32 testPoly2DEvalVector(void); -static psS32 testDPoly2DEvalVector(void); testDescription tests[] = { {testPoly2DEval,583,"psPolynomial2DEval",0,false}, - {testDPoly2DEval,582,"psDPolynomial2DEval",0,false}, {testPoly2DEvalVector,000,"psPolynomial2DEvalVector",0,false}, - {testDPoly2DEvalVector,000,"psDPolynomial2DEvalVector",0,false}, {NULL} }; @@ -85,9 +81,9 @@ // This test will verify operation of 1D polynomial evaluation -psS32 testPoly2DEval(void) +/*psS32 testPoly2DEval(void) { psF32 result; psF32 resultCheb; - + // Allocate polynomial structure psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS, TERMS, PS_POLYNOMIAL_ORD); @@ -119,5 +115,5 @@ psFree(polyOrd); psFree(polyCheb); - + // Allocate polynomial with invalid type polyOrd = psPolynomial2DAlloc(TERMS, TERMS, 99); @@ -130,10 +126,10 @@ } psFree(polyOrd); - + return 0; } - +*/ // This test will verify operation of 1D polynomial evaluation -psS32 testDPoly2DEval(void) +psS32 testPoly2DEval(void) { psF64 result; @@ -141,6 +137,6 @@ // Allocate polynomial structure - psDPolynomial2D* polyOrd = psDPolynomial2DAlloc(TERMS, TERMS, PS_POLYNOMIAL_ORD); - psDPolynomial2D* polyCheb = psDPolynomial2DAlloc(TERMS, TERMS, PS_POLYNOMIAL_CHEB); + psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS, TERMS, PS_POLYNOMIAL_ORD); + psPolynomial2D* polyCheb = psPolynomial2DAlloc(TERMS, TERMS, PS_POLYNOMIAL_CHEB); // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -154,5 +150,5 @@ // Evaluate test points and verify results for(psS32 i = 0; i < TESTPOINTS; i++) { - result = psDPolynomial2DEval(polyOrd,Dpoly2DXYValue[i][0],Dpoly2DXYValue[i][1]); + 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", @@ -160,5 +156,5 @@ return i; } - resultCheb = psDPolynomial2DEval(polyCheb,Dpoly2DXYChebValue[i][0],Dpoly2DXYChebValue[i][1]); + 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", @@ -171,8 +167,8 @@ // Allocate polynomial with invalid type - polyOrd = psDPolynomial2DAlloc(TERMS, TERMS, 99); + polyOrd = psPolynomial2DAlloc(TERMS, TERMS, 99); // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); - result = psDPolynomial2DEval(polyOrd,0.0, 0.0); + result = psPolynomial2DEval(polyOrd,0.0, 0.0); if ( !isnan(result) ) { psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid polynomial type"); @@ -184,10 +180,10 @@ } -psS32 testPoly2DEvalVector(void) +/*psS32 testPoly2DEvalVector(void) { // Allocate polynomial psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS,TERMS,PS_POLYNOMIAL_ORD); psPolynomial2D* polyCheb = psPolynomial2DAlloc(TERMS,TERMS,PS_POLYNOMIAL_CHEB); - + // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -199,5 +195,5 @@ } } - + // Create input vectors psVector* inputOrdX = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); @@ -211,5 +207,5 @@ inputChebY->data.F32[i] = poly2DXYChebValue[i][1]; } - + // Evaluate the vectors psVector* outputOrd = psPolynomial2DEvalVector(polyOrd, inputOrdX, inputOrdY); @@ -233,5 +229,5 @@ return 2; } - + // Verify the results for(psS32 i = 0; i < TESTPOINTS; i++) { @@ -247,5 +243,5 @@ } } - + // Attempt to invoke function with null polynomial psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial"); @@ -254,5 +250,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"); @@ -267,5 +263,5 @@ 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"); @@ -284,5 +280,5 @@ } inputOrdY->type.type = PS_TYPE_F32; - + psFree(inputOrdX); psFree(inputOrdY); @@ -293,13 +289,13 @@ psFree(polyOrd); psFree(polyCheb); - + return 0; } - -psS32 testDPoly2DEvalVector(void) +*/ +psS32 testPoly2DEvalVector(void) { // Allocate polynomial - psDPolynomial2D* polyOrd = psDPolynomial2DAlloc(TERMS,TERMS,PS_POLYNOMIAL_ORD); - psDPolynomial2D* polyCheb = psDPolynomial2DAlloc(TERMS,TERMS,PS_POLYNOMIAL_CHEB); + psPolynomial2D* polyOrd = psPolynomial2DAlloc(TERMS,TERMS,PS_POLYNOMIAL_ORD); + psPolynomial2D* polyCheb = psPolynomial2DAlloc(TERMS,TERMS,PS_POLYNOMIAL_CHEB); // Set polynomial members @@ -326,5 +322,5 @@ // Evaluate the vectors - psVector* outputOrd = psDPolynomial2DEvalVector(polyOrd, inputOrdX, inputOrdY); + psVector* outputOrd = psPolynomial2DEvalVector(polyOrd, inputOrdX, inputOrdY); if(outputOrd == NULL) { psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); @@ -336,5 +332,5 @@ return 2; } - psVector* outputCheb = psDPolynomial2DEvalVector(polyCheb, inputChebX, inputChebY); + psVector* outputCheb = psPolynomial2DEvalVector(polyCheb, inputChebX, inputChebY); if(outputCheb == NULL) { psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); @@ -363,5 +359,5 @@ // Attempt to invoke function with null polynomial psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial"); - if(psDPolynomial2DEvalVector(NULL, inputOrdX, inputOrdY) != NULL) { + if(psPolynomial2DEvalVector(NULL, inputOrdX, inputOrdY) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL polynomial"); return 60; @@ -370,5 +366,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(psDPolynomial2DEvalVector(polyOrd,NULL,inputOrdY) != NULL) { + if(psPolynomial2DEvalVector(polyOrd,NULL,inputOrdY) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 61; @@ -376,5 +372,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(psDPolynomial2DEvalVector(polyOrd,inputOrdX,NULL) != NULL) { + if(psPolynomial2DEvalVector(polyOrd,inputOrdX,NULL) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 62; @@ -384,5 +380,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdX->type.type = PS_TYPE_U8; - if(psDPolynomial2DEvalVector(polyOrd,inputOrdX, inputOrdY) != NULL) { + if(psPolynomial2DEvalVector(polyOrd,inputOrdX, inputOrdY) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 63; @@ -392,5 +388,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdY->type.type = PS_TYPE_U8; - if(psDPolynomial2DEvalVector(polyOrd,inputOrdX, inputOrdY) != NULL) { + if(psPolynomial2DEvalVector(polyOrd,inputOrdX, inputOrdY) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 64;