Index: /trunk/psLib/test/math/.cvsignore =================================================================== --- /trunk/psLib/test/math/.cvsignore (revision 10596) +++ /trunk/psLib/test/math/.cvsignore (revision 10597) @@ -53,2 +53,3 @@ tap_psMD5 tap_psStats_Sample_01 +tap_psPolynomialUtils_Derivatives Index: /trunk/psLib/test/math/Makefile.am =================================================================== --- /trunk/psLib/test/math/Makefile.am (revision 10596) +++ /trunk/psLib/test/math/Makefile.am (revision 10597) @@ -16,5 +16,6 @@ tap_psSparse \ tap_psStatsTiming \ - tap_psStats_Sample_01 + tap_psStats_Sample_01 \ + tap_psPolynomialUtils_Derivatives if BUILD_TESTS Index: /trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c =================================================================== --- /trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 10597) +++ /trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 10597) @@ -0,0 +1,209 @@ +#include +#include +#include + +#include "tap.h" +#include "pstap.h" + +int main (void) +{ + plan_tests(48); + + diag("psPolynomial2D Derivative tests"); + + // test psPolynomial2D_dX (no supplied output) + { + psMemId id = psMemGetId(); + + diag ("test psPolynomial2D_dX (no supplied output)"); + + psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); + ok(poly != NULL, "psPolynomial2D successfully allocated"); + skip_start(poly == NULL, 5, "Skipping tests because psPolynomial2DAlloc() failed"); + + // build sample polynomial (upper-left elements only) + // z = 5 + 2x + 3y - 3x^2 + 4xy - 2y^2 + // dz/dx = 2 - 6x + 4y + poly->coeff[0][0] = 5.0; + poly->coeff[1][0] = 2.0; + poly->coeff[0][1] = 3.0; + poly->coeff[2][0] = -3.0; + poly->coeff[1][1] = 4.0; + poly->coeff[0][2] = -2.0; + + // mask remaining elements + poly->mask[2][1] = 1; + poly->mask[1][2] = 1; + poly->mask[2][2] = 1; + + psPolynomial2D *dX = psPolynomial2D_dX (NULL, poly); + + ok(dX->nX == 1, "new x order is %d", dX->nX); + ok(dX->nY == 2, "new y order is %d", dX->nY); + + ok_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]); + ok_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]); + ok_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"); + + psFree (dX); + psFree (poly); + + skip_end(); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // test psPolynomial2D_dX (supplied output) + { + psMemId id = psMemGetId(); + + diag ("test psPolynomial2D_dX (supplied output)"); + + psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); + ok(poly != NULL, "psPolynomial2D successfully allocated"); + skip_start(poly == NULL, 5, "Skipping tests because psPolynomial2DAlloc() failed"); + + // build sample polynomial (upper-left elements only) + // z = 5 + 2x + 3y - 3x^2 + 4xy - 2y^2 + // dz/dx = 2 - 6x + 4y + poly->coeff[0][0] = 5.0; + poly->coeff[1][0] = 2.0; + poly->coeff[0][1] = 3.0; + poly->coeff[2][0] = -3.0; + poly->coeff[1][1] = 4.0; + poly->coeff[0][2] = -2.0; + + // mask remaining elements + poly->mask[2][1] = 1; + poly->mask[1][2] = 1; + poly->mask[2][2] = 1; + + psPolynomial2D *dX = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); + psPolynomial2D_dX (dX, poly); + + ok(dX->nX == 1, "new x order is %d", dX->nX); + ok(dX->nY == 2, "new y order is %d", dX->nY); + + ok_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]); + ok_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]); + ok_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"); + + psFree (dX); + psFree (poly); + + skip_end(); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // test psPolynomial2D_dY (no supplied output) + { + psMemId id = psMemGetId(); + + diag ("test psPolynomial2D_dY (no supplied output)"); + + psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); + ok(poly != NULL, "psPolynomial2D successfully allocated"); + skip_start(poly == NULL, 5, "Skipping tests because psPolynomial2DAlloc() failed"); + + // build sample polynomial (upper-left elements only) + // z = 5 + 2x + 3y - 3x^2 + 4xy - 2y^2 + // dz/dy = 3 + 4x - 4y + poly->coeff[0][0] = 5.0; + poly->coeff[1][0] = 2.0; + poly->coeff[0][1] = 3.0; + poly->coeff[2][0] = -3.0; + poly->coeff[1][1] = 4.0; + poly->coeff[0][2] = -2.0; + + // mask remaining elements + poly->mask[2][1] = 1; + poly->mask[1][2] = 1; + poly->mask[2][2] = 1; + + psPolynomial2D *dY = psPolynomial2D_dY (NULL, poly); + + ok(dY->nX == 1, "new x order is %d", dY->nX); + ok(dY->nY == 2, "new y order is %d", dY->nY); + + ok_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]); + ok_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]); + ok_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"); + + psFree (dY); + psFree (poly); + + skip_end(); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + // test psPolynomial2D_dY (supplied output) + { + psMemId id = psMemGetId(); + + diag ("test psPolynomial2D_dY (supplied output)"); + + psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); + ok(poly != NULL, "psPolynomial2D successfully allocated"); + skip_start(poly == NULL, 5, "Skipping tests because psPolynomial2DAlloc() failed"); + + // build sample polynomial (upper-left elements only) + // z = 5 + 2x + 3y - 3x^2 + 4xy - 2y^2 + // dz/dy = 3 + 4x - 4y + poly->coeff[0][0] = 5.0; + poly->coeff[1][0] = 2.0; + poly->coeff[0][1] = 3.0; + poly->coeff[2][0] = -3.0; + poly->coeff[1][1] = 4.0; + poly->coeff[0][2] = -2.0; + + // mask remaining elements + poly->mask[2][1] = 1; + poly->mask[1][2] = 1; + poly->mask[2][2] = 1; + + psPolynomial2D *dY = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); + psPolynomial2D_dY (dY, poly); + + ok(dY->nX == 1, "new x order is %d", dY->nX); + ok(dY->nY == 2, "new y order is %d", dY->nY); + + ok_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]); + ok_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]); + ok_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"); + + psFree (dY); + psFree (poly); + + skip_end(); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } + + return exit_status(); +}