Index: trunk/psLib/test/math/tap_psPolyFit4D.c =================================================================== --- trunk/psLib/test/math/tap_psPolyFit4D.c (revision 16793) +++ trunk/psLib/test/math/tap_psPolyFit4D.c (revision 17515) @@ -166,5 +166,5 @@ for (int iz = 0; iz < polyOrderZ + 1; iz++) { for (int it = 0; it < polyOrderT + 1; it++) { - myPoly->mask[ix][iy][iz][it] = 0xff; // Mask it out + myPoly->coeffMask[ix][iy][iz][it] = 0xff; // Mask it out } } @@ -173,10 +173,10 @@ // Put these back in - myPoly->mask[0][0][0][0] = 0; // A - myPoly->mask[1][0][0][0] = 0; // B * x - myPoly->mask[0][1][0][0] = 0; // C * y - myPoly->mask[0][0][1][0] = 0; // D * z - myPoly->mask[0][0][0][1] = 0; // E * t - myPoly->mask[1][1][0][0] = 0; // F * xy + myPoly->coeffMask[0][0][0][0] = 0; // A + myPoly->coeffMask[1][0][0][0] = 0; // B * x + myPoly->coeffMask[0][1][0][0] = 0; // C * y + myPoly->coeffMask[0][0][1][0] = 0; // D * z + myPoly->coeffMask[0][0][0][1] = 0; // E * t + myPoly->coeffMask[1][1][0][0] = 0; // F * xy #endif Index: trunk/psLib/test/math/tap_psPolynomial.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomial.c (revision 16793) +++ trunk/psLib/test/math/tap_psPolynomial.c (revision 17515) @@ -16,6 +16,6 @@ * XXX: Compare to FLT_EPSILON * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:35:16 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-05 00:09:04 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -61,6 +61,6 @@ errorFlag = true; } - if (my1DPoly->mask[i] != 0) { - diag("Mask[%d] %d not as expected %d", i, my1DPoly->mask[i], 0); + if (my1DPoly->coeffMask[i] != 0) { + diag("Mask[%d] %d not as expected %d", i, my1DPoly->coeffMask[i], 0); errorFlag = true; } @@ -135,6 +135,6 @@ errorFlag = true; } - if (my2DPoly->mask[i][j] != 0) { - diag("Mask[%d][%d] %d not as expected %d", i, j, my2DPoly->mask[i][j], 0); + if (my2DPoly->coeffMask[i][j] != 0) { + diag("Mask[%d][%d] %d not as expected %d", i, j, my2DPoly->coeffMask[i][j], 0); errorFlag = true; } @@ -214,7 +214,7 @@ errorFlag = true; } - if (my3DPoly->mask[i][j][k] != 0) { + if (my3DPoly->coeffMask[i][j][k] != 0) { diag("Mask[%d][%d][%d] %d not as expected %d", - i, j, k, my3DPoly->mask[i][j][k], 0); + i, j, k, my3DPoly->coeffMask[i][j][k], 0); errorFlag = true; } @@ -301,7 +301,7 @@ errorFlag = true; } - if (my4DPoly->mask[i][j][k][l] != 0) { + if (my4DPoly->coeffMask[i][j][k][l] != 0) { diag("Mask[%d][%d][%d][%d] %d not as expected %d", - i, j, k, l, my4DPoly->mask[i][j][k][l], 0); + i, j, k, l, my4DPoly->coeffMask[i][j][k][l], 0); errorFlag = true; } Index: trunk/psLib/test/math/tap_psPolynomialEval1D.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialEval1D.c (revision 16793) +++ trunk/psLib/test/math/tap_psPolynomialEval1D.c (revision 17515) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-05 00:09:04 $ * * XXX: Probably should test single- and multi-dimensional polynomials in @@ -68,5 +68,5 @@ for(psS32 i = 0; i < TERMS; i++) { polyOrd->coeff[i] = poly1DCoeff[i]; - polyOrd->mask[i] = poly1DMask[i]; + polyOrd->coeffMask[i] = poly1DMask[i]; } @@ -97,5 +97,5 @@ { polyCheb->coeff[i] = 1.0; - polyCheb->mask[i] = poly1DMask[i]; + polyCheb->coeffMask[i] = poly1DMask[i]; } // Evaluate test points and verify results @@ -133,5 +133,5 @@ { polyOrd->coeff[i] = poly1DCoeff[i]; - polyOrd->mask[i] = poly1DMask[i]; + polyOrd->coeffMask[i] = poly1DMask[i]; } @@ -199,5 +199,5 @@ { polyCheb->coeff[i] = 1.0; - polyCheb->mask[i] = poly1DMask[i]; + polyCheb->coeffMask[i] = poly1DMask[i]; } Index: trunk/psLib/test/math/tap_psPolynomialEval2D.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialEval2D.c (revision 16793) +++ trunk/psLib/test/math/tap_psPolynomialEval2D.c (revision 17515) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-05 00:09:04 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -96,5 +96,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyOrd->coeff[i][j] = poly2DCoeff[i][j]; - polyOrd->mask[i][j] = poly2DMask[i][j]; + polyOrd->coeffMask[i][j] = poly2DMask[i][j]; } } @@ -131,5 +131,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyCheb->coeff[i][j] = 1.0; - polyCheb->mask[i][j] = poly2DMask[i][j]; + polyCheb->coeffMask[i][j] = poly2DMask[i][j]; } } @@ -174,5 +174,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyOrd->coeff[i][j] = poly2DCoeff[i][j]; - polyOrd->mask[i][j] = poly2DMask[i][j]; + polyOrd->coeffMask[i][j] = poly2DMask[i][j]; } } @@ -268,5 +268,5 @@ for(psS32 j = 0; j < TERMS; j++) { polyCheb->coeff[i][j] = 1.0; - polyCheb->mask[i][j] = poly2DMask[i][j]; + polyCheb->coeffMask[i][j] = poly2DMask[i][j]; } } Index: trunk/psLib/test/math/tap_psPolynomialEval3D.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialEval3D.c (revision 16793) +++ trunk/psLib/test/math/tap_psPolynomialEval3D.c (revision 17515) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-05 00:09:04 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -149,5 +149,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyOrd->coeff[i][j][k] = Dpoly3DCoeff[i][j][k]; - polyOrd->mask[i][j][k] = poly3DMask[i][j][k]; + polyOrd->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } @@ -188,5 +188,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyCheb->coeff[i][j][k] = 1.0; - polyCheb->mask[i][j][k] = poly3DMask[i][j][k]; + polyCheb->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } @@ -239,5 +239,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyOrd->coeff[i][j][k] = Dpoly3DCoeff[i][j][k]; - polyOrd->mask[i][j][k] = poly3DMask[i][j][k]; + polyOrd->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } @@ -355,5 +355,5 @@ for(psS32 k = 0; k < TERMS; k++) { polyCheb->coeff[i][j][k] = 1.0; - polyCheb->mask[i][j][k] = poly3DMask[i][j][k]; + polyCheb->coeffMask[i][j][k] = poly3DMask[i][j][k]; } } Index: trunk/psLib/test/math/tap_psPolynomialEval4D.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialEval4D.c (revision 16793) +++ trunk/psLib/test/math/tap_psPolynomialEval4D.c (revision 17515) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2007-05-08 06:36:51 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2008-05-05 00:09:04 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -389,5 +389,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyOrd->coeff[i][j][k][l] = Dpoly4DCoeff[i][j][k][l]; - polyOrd->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyOrd->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } @@ -428,5 +428,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyCheb->coeff[i][j][k][l] = 1.0; - polyCheb->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyCheb->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } @@ -485,5 +485,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyOrd->coeff[i][j][k][l] = Dpoly4DCoeff[i][j][k][l]; - polyOrd->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyOrd->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } @@ -629,5 +629,5 @@ for(psS32 l = 0; l < TERMS; l++) { polyCheb->coeff[i][j][k][l] = 1.0; - polyCheb->mask[i][j][k][l] = poly4DMask[i][j][k][l]; + polyCheb->coeffMask[i][j][k][l] = poly4DMask[i][j][k][l]; } } Index: trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 16793) +++ trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 17515) @@ -33,7 +33,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dX = psPolynomial2D_dX (NULL, poly); @@ -46,10 +46,10 @@ is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); - ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dX->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dX->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dX->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dX->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dX->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dX->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dX->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dX->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dX->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dX); @@ -81,7 +81,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dX = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -95,10 +95,10 @@ is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]); - ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dX->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dX->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dX->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dX->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dX->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dX->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dX->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dX->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dX->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dX); @@ -130,7 +130,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *result = psPolynomial2D_dX (poly, poly); @@ -163,7 +163,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dY = psPolynomial2D_dY (NULL, poly); @@ -176,10 +176,10 @@ is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); - ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dY->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dY->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dY->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dY->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dY->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dY->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dY->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dY->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dY->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dY); @@ -211,7 +211,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *dY = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -225,10 +225,10 @@ is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]); - ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!dY->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!dY->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(dY->mask[1][1], "x^1 y^1 coeff is masked"); - ok(dY->mask[1][2], "x^1 y^2 coeff is masked"); + ok(!dY->coeffMask[0][0], "x^0 y^0 coeff is unmasked"); + ok(!dY->coeffMask[1][0], "x^1 y^0 coeff is unmasked"); + ok(!dY->coeffMask[0][1], "x^0 y^1 coeff is unmasked"); + + ok(dY->coeffMask[1][1], "x^1 y^1 coeff is masked"); + ok(dY->coeffMask[1][2], "x^1 y^2 coeff is masked"); psFree (dY); @@ -260,7 +260,7 @@ // mask remaining elements - poly->mask[2][1] = 1; - poly->mask[1][2] = 1; - poly->mask[2][2] = 1; + poly->coeffMask[2][1] = 1; + poly->coeffMask[1][2] = 1; + poly->coeffMask[2][2] = 1; psPolynomial2D *result = psPolynomial2D_dY (poly, poly);