Index: trunk/psLib/test/math/tst_psFunc11.c =================================================================== --- trunk/psLib/test/math/tst_psFunc11.c (revision 4547) +++ trunk/psLib/test/math/tst_psFunc11.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 testPoly4DEval(void); -static psS32 testDPoly4DEval(void); static psS32 testPoly4DEvalVector(void); -static psS32 testDPoly4DEvalVector(void); testDescription tests[] = { {testPoly4DEval,583,"psPolynomial4DEval",0,false}, - {testDPoly4DEval,582,"psDPolynomial4DEval",0,false}, {testPoly4DEvalVector,000,"psPolynomial4DEvalVector",0,false}, - {testDPoly4DEvalVector,000,"psDPolynomial4DEvalVector",0,false}, {NULL} }; @@ -378,9 +374,9 @@ // This test will verify operation of 1D polynomial evaluation -psS32 testPoly4DEval(void) +/*psS32 testPoly4DEval(void) { psF32 result; psF32 resultCheb; - + // Allocate polynomial structure psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); @@ -418,5 +414,5 @@ psFree(polyOrd); psFree(polyCheb); - + // Allocate polynomial with invalid type polyOrd = psPolynomial4DAlloc(TERMS, TERMS, TERMS, TERMS, 99); @@ -429,10 +425,10 @@ } psFree(polyOrd); - + return 0; } - +*/ // This test will verify operation of 1D polynomial evaluation -psS32 testDPoly4DEval(void) +psS32 testPoly4DEval(void) { psF64 result; @@ -440,6 +436,6 @@ // Allocate polynomial structure - psDPolynomial4D* polyOrd = psDPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); - psDPolynomial4D* polyCheb = psDPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); + psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); + psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -457,6 +453,6 @@ // Evaluate test points and verify results for(psS32 i = 0; i < TESTPOINTS; i++) { - result = psDPolynomial4DEval(polyOrd,Dpoly4DWXYZValue[i][0],Dpoly4DWXYZValue[i][1], - Dpoly4DWXYZValue[i][2],Dpoly4DWXYZValue[i][3]); + 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", @@ -464,6 +460,6 @@ return i; } - resultCheb = psDPolynomial4DEval(polyCheb,Dpoly4DWXYZChebValue[i][0],Dpoly4DWXYZChebValue[i][1], - Dpoly4DWXYZChebValue[i][2],Dpoly4DWXYZChebValue[i][3]); + 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", @@ -476,8 +472,8 @@ // Allocate polynomial with invalid type - polyOrd = psDPolynomial4DAlloc(TERMS, TERMS, TERMS, TERMS, 99); + polyOrd = psPolynomial4DAlloc(TERMS, TERMS, TERMS, TERMS, 99); // Attempt to evaluation invalid polynomial type psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid type"); - result = psDPolynomial4DEval(polyOrd,0.0, 0.0, 0.0, 0.0); + 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"); @@ -489,10 +485,10 @@ } -psS32 testPoly4DEvalVector(void) +/*psS32 testPoly4DEvalVector(void) { // Allocate polynomial psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); - + // Set polynomial members for(psS32 i = 0; i < TERMS; i++) { @@ -508,5 +504,5 @@ } } - + // Create input vectors psVector* inputOrdW = psVectorAlloc(TESTPOINTS, PS_TYPE_F32); @@ -528,5 +524,5 @@ inputChebZ->data.F32[i] = poly4DWXYZChebValue[i][3]; } - + // Evaluate the vectors psVector* outputOrd = psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ); @@ -550,5 +546,5 @@ return 2; } - + // Verify the results for(psS32 i = 0; i < TESTPOINTS; i++) { @@ -564,5 +560,5 @@ } } - + // Attempt to invoke function with null polynomial psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial"); @@ -571,5 +567,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"); @@ -596,5 +592,5 @@ 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"); @@ -629,5 +625,5 @@ } inputOrdW->type.type = PS_TYPE_F32; - + psFree(inputOrdW); psFree(inputOrdX); @@ -642,13 +638,13 @@ psFree(polyOrd); psFree(polyCheb); - + return 0; } - -psS32 testDPoly4DEvalVector(void) +*/ +psS32 testPoly4DEvalVector(void) { // Allocate polynomial - psDPolynomial4D* polyOrd = psDPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); - psDPolynomial4D* polyCheb = psDPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); + psPolynomial4D* polyOrd = psPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_ORD); + psPolynomial4D* polyCheb = psPolynomial4DAlloc(TERMS,TERMS,TERMS,TERMS,PS_POLYNOMIAL_CHEB); // Set polynomial members @@ -687,5 +683,5 @@ // Evaluate the vectors - psVector* outputOrd = psDPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ); + psVector* outputOrd = psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ); if(outputOrd == NULL) { psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); @@ -697,5 +693,5 @@ return 2; } - psVector* outputCheb = psDPolynomial4DEvalVector(polyCheb,inputChebW,inputChebX,inputChebY,inputChebZ); + psVector* outputCheb = psPolynomial4DEvalVector(polyCheb,inputChebW,inputChebX,inputChebY,inputChebZ); if(outputCheb == NULL) { psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL."); @@ -724,5 +720,5 @@ // Attempt to invoke function with null polynomial psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL polynomial"); - if(psDPolynomial4DEvalVector(NULL,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(NULL,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL polynomial"); return 60; @@ -731,5 +727,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(psDPolynomial4DEvalVector(polyOrd,NULL,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,NULL,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 61; @@ -737,5 +733,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(psDPolynomial4DEvalVector(polyOrd,inputOrdW,NULL,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,inputOrdW,NULL,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 62; @@ -743,5 +739,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(psDPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,NULL,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,NULL,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 63; @@ -749,5 +745,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(psDPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,NULL) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,NULL) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return of NULL expected for NULL input vector"); return 64; @@ -757,5 +753,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdX->type.type = PS_TYPE_U8; - if(psDPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 65; @@ -765,5 +761,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdY->type.type = PS_TYPE_U8; - if(psDPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 66; @@ -773,5 +769,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdZ->type.type = PS_TYPE_U8; - if(psDPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 67; @@ -781,5 +777,5 @@ psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid input type"); inputOrdW->type.type = PS_TYPE_U8; - if(psDPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { + if(psPolynomial4DEvalVector(polyOrd,inputOrdW,inputOrdX,inputOrdY,inputOrdZ) != NULL) { psError(PS_ERR_UNKNOWN,true,"Return NULL expected for non-F64 input vector"); return 68;