IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 4, 2008, 2:09:04 PM (18 years ago)
Author:
eugene
Message:

merging from eam_branch_20080430 : cleanups for tests, minor fixes from tests, reduced verbosity level in some places, add UPDATE and RESET directives to MULTI and METADATA in config files

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c

    r12607 r17515  
    3333
    3434        // mask remaining elements
    35         poly->mask[2][1] = 1;
    36         poly->mask[1][2] = 1;
    37         poly->mask[2][2] = 1;
     35        poly->coeffMask[2][1] = 1;
     36        poly->coeffMask[1][2] = 1;
     37        poly->coeffMask[2][2] = 1;
    3838
    3939        psPolynomial2D *dX = psPolynomial2D_dX (NULL, poly);
    … …  
    4646        is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]);
    4747
    48         ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked");
    49         ok(!dX->mask[1][0], "x^1 y^0 coeff is unmasked");
    50         ok(!dX->mask[0][1], "x^0 y^1 coeff is unmasked");
    51 
    52         ok(dX->mask[1][1], "x^1 y^1 coeff is masked");
    53         ok(dX->mask[1][2], "x^1 y^2 coeff is masked");
     48        ok(!dX->coeffMask[0][0], "x^0 y^0 coeff is unmasked");
     49        ok(!dX->coeffMask[1][0], "x^1 y^0 coeff is unmasked");
     50        ok(!dX->coeffMask[0][1], "x^0 y^1 coeff is unmasked");
     51
     52        ok(dX->coeffMask[1][1], "x^1 y^1 coeff is masked");
     53        ok(dX->coeffMask[1][2], "x^1 y^2 coeff is masked");
    5454
    5555        psFree (dX);
    … …  
    8181
    8282        // mask remaining elements
    83         poly->mask[2][1] = 1;
    84         poly->mask[1][2] = 1;
    85         poly->mask[2][2] = 1;
     83        poly->coeffMask[2][1] = 1;
     84        poly->coeffMask[1][2] = 1;
     85        poly->coeffMask[2][2] = 1;
    8686
    8787        psPolynomial2D *dX = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    9595        is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]);
    9696
    97         ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked");
    98         ok(!dX->mask[1][0], "x^1 y^0 coeff is unmasked");
    99         ok(!dX->mask[0][1], "x^0 y^1 coeff is unmasked");
    100 
    101         ok(dX->mask[1][1], "x^1 y^1 coeff is masked");
    102         ok(dX->mask[1][2], "x^1 y^2 coeff is masked");
     97        ok(!dX->coeffMask[0][0], "x^0 y^0 coeff is unmasked");
     98        ok(!dX->coeffMask[1][0], "x^1 y^0 coeff is unmasked");
     99        ok(!dX->coeffMask[0][1], "x^0 y^1 coeff is unmasked");
     100
     101        ok(dX->coeffMask[1][1], "x^1 y^1 coeff is masked");
     102        ok(dX->coeffMask[1][2], "x^1 y^2 coeff is masked");
    103103
    104104        psFree (dX);
    … …  
    130130
    131131        // mask remaining elements
    132         poly->mask[2][1] = 1;
    133         poly->mask[1][2] = 1;
    134         poly->mask[2][2] = 1;
     132        poly->coeffMask[2][1] = 1;
     133        poly->coeffMask[1][2] = 1;
     134        poly->coeffMask[2][2] = 1;
    135135
    136136        psPolynomial2D *result = psPolynomial2D_dX (poly, poly);
    … …  
    163163
    164164        // mask remaining elements
    165         poly->mask[2][1] = 1;
    166         poly->mask[1][2] = 1;
    167         poly->mask[2][2] = 1;
     165        poly->coeffMask[2][1] = 1;
     166        poly->coeffMask[1][2] = 1;
     167        poly->coeffMask[2][2] = 1;
    168168
    169169        psPolynomial2D *dY = psPolynomial2D_dY (NULL, poly);
    … …  
    176176        is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]);
    177177
    178         ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked");
    179         ok(!dY->mask[1][0], "x^1 y^0 coeff is unmasked");
    180         ok(!dY->mask[0][1], "x^0 y^1 coeff is unmasked");
    181 
    182         ok(dY->mask[1][1], "x^1 y^1 coeff is masked");
    183         ok(dY->mask[1][2], "x^1 y^2 coeff is masked");
     178        ok(!dY->coeffMask[0][0], "x^0 y^0 coeff is unmasked");
     179        ok(!dY->coeffMask[1][0], "x^1 y^0 coeff is unmasked");
     180        ok(!dY->coeffMask[0][1], "x^0 y^1 coeff is unmasked");
     181
     182        ok(dY->coeffMask[1][1], "x^1 y^1 coeff is masked");
     183        ok(dY->coeffMask[1][2], "x^1 y^2 coeff is masked");
    184184
    185185        psFree (dY);
    … …  
    211211
    212212        // mask remaining elements
    213         poly->mask[2][1] = 1;
    214         poly->mask[1][2] = 1;
    215         poly->mask[2][2] = 1;
     213        poly->coeffMask[2][1] = 1;
     214        poly->coeffMask[1][2] = 1;
     215        poly->coeffMask[2][2] = 1;
    216216
    217217        psPolynomial2D *dY = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    225225        is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]);
    226226
    227         ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked");
    228         ok(!dY->mask[1][0], "x^1 y^0 coeff is unmasked");
    229         ok(!dY->mask[0][1], "x^0 y^1 coeff is unmasked");
    230 
    231         ok(dY->mask[1][1], "x^1 y^1 coeff is masked");
    232         ok(dY->mask[1][2], "x^1 y^2 coeff is masked");
     227        ok(!dY->coeffMask[0][0], "x^0 y^0 coeff is unmasked");
     228        ok(!dY->coeffMask[1][0], "x^1 y^0 coeff is unmasked");
     229        ok(!dY->coeffMask[0][1], "x^0 y^1 coeff is unmasked");
     230
     231        ok(dY->coeffMask[1][1], "x^1 y^1 coeff is masked");
     232        ok(dY->coeffMask[1][2], "x^1 y^2 coeff is masked");
    233233
    234234        psFree (dY);
    … …  
    260260
    261261        // mask remaining elements
    262         poly->mask[2][1] = 1;
    263         poly->mask[1][2] = 1;
    264         poly->mask[2][2] = 1;
     262        poly->coeffMask[2][1] = 1;
     263        poly->coeffMask[1][2] = 1;
     264        poly->coeffMask[2][2] = 1;
    265265
    266266        psPolynomial2D *result = psPolynomial2D_dY (poly, poly);
Note: See TracChangeset for help on using the changeset viewer.