IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 28, 2006, 6:38:42 PM (20 years ago)
Author:
magnier
Message:

changed return value for psVectorFit functions to bool; now using stats->option to set FitClip

Location:
trunk/psLib/test/math
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/test/math

    • Property svn:ignore

      •  

        old new  
        44Makefile
        55Makefile.in
        6 tst_psFunc01
        7 tst_psHist00
        8 tst_psHist01
        9 tst_psHist02
        10 tst_psHist03
        11 tst_psMatrix01
        12 tst_psMatrix02
        13 tst_psMatrix03
        14 tst_psMatrix04
        15 tst_psMatrix05
        16 tst_psMatrix06
        17 tst_psMatrix07
        18 tst_psMatrixVectorArithmetic01
        19 tst_psMatrixVectorArithmetic02
        20 tst_psMatrixVectorArithmetic03
        21 tst_psMatrixVectorArithmetic04
        22 tst_psRandom
        23 tst_psStats00
        24 tst_psStats01
        25 tst_psStats02
        26 tst_psStats03
        27 tst_psStats05
        28 tst_psStats06
        29 tst_psStats07
        30 tst_psStats08
        31 tst_psStats09
        326seed_msglog1.txt
        337seed_msglog2.txt
        34 tst_psSpline1D
        35 tst_psMathUtils
        36 tst_psMinimizeLMM
        37 tst_psMinimizePowell
        38 tst_psPolyFit1D
        39 tst_psPolyFit2D
        40 tst_psPolyFit3D
        41 tst_psPolyFit4D
        42 tst_psPolynomial
        43 tst_psPolynomialEval1D
        44 tst_psPolynomialEval2D
        45 tst_psPolynomialEval3D
        46 tst_psPolynomialEval4D
        478*.bb
        489*.bbg
        4910*.da
        5011gmon.out
         12tap_psHist00
         13tap_psHist01
         14tap_psHist02
         15tap_psHist03
         16tap_psMD5
         17tap_psMatrix01
         18tap_psMatrix02
         19tap_psMatrix03
         20tap_psMatrix04
         21tap_psMatrix05
         22tap_psMatrix06
         23tap_psMatrix07
         24tap_psPolyFit1D
         25tap_psPolyFit2D
         26tap_psPolyFit3D
         27tap_psPolyFit4D
         28tap_psPolynomial
         29tap_psPolynomialEval1D
         30tap_psPolynomialEval2D
         31tap_psPolynomialEval3D
         32tap_psPolynomialEval4D
         33tap_psPolynomialUtils_Derivatives
        5134tap_psSparse
         35tap_psStats00
         36tap_psStats01
         37tap_psStats02
         38tap_psStats03
         39tap_psStats05
         40tap_psStats06
         41tap_psStats07
         42tap_psStats08
         43tap_psStats09
        5244tap_psStatsTiming
        53 tap_psMD5
        5445tap_psStats_Sample_01
        55 tap_psPolynomialUtils_Derivatives

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

    r10605 r10848  
    88int main (void)
    99{
    10     plan_tests(72);
    11 
    12     diag("psPolynomial2D Derivative tests");
     10    plan_tests(54);
     11
     12    note("psPolynomial2D Derivative tests");
    1313
    1414    // test psPolynomial2D_dX (no supplied output)
    … …  
    1616        psMemId id = psMemGetId();
    1717
    18         diag ("test psPolynomial2D_dX (no supplied output)");
     18        note ("test psPolynomial2D_dX (no supplied output)");
    1919
    2020        psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    6464        psMemId id = psMemGetId();
    6565
    66         diag ("test psPolynomial2D_dX (supplied output)");
     66        note ("test psPolynomial2D_dX (supplied output)");
    6767
    6868        psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    113113        psMemId id = psMemGetId();
    114114
    115         diag ("test psPolynomial2D_dX (supplied output)");
     115        note ("test psPolynomial2D_dX (supplied output)");
    116116
    117117        psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    134134        poly->mask[2][2] = 1;
    135135
    136         poly = psPolynomial2D_dX (poly, poly);
    137 
    138         ok(poly->nX == 1, "new x order is %d", poly->nX);
    139         ok(poly->nY == 2, "new y order is %d", poly->nY);
    140 
    141         ok_float(poly->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", poly->coeff[0][0]);
    142         ok_float(poly->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", poly->coeff[1][0]);
    143         ok_float(poly->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", poly->coeff[0][1]);
    144 
    145         ok(!poly->mask[0][0], "x^0 y^0 coeff is unmasked");
    146         ok(!poly->mask[1][0], "x^1 y^0 coeff is unmasked");
    147         ok(!poly->mask[0][1], "x^0 y^1 coeff is unmasked");
    148 
    149         ok(poly->mask[1][1], "x^1 y^1 coeff is masked");
    150         ok(poly->mask[1][2], "x^1 y^2 coeff is masked");
    151 
    152         psFree (poly);
    153 
     136        psPolynomial2D *result = psPolynomial2D_dX (poly, poly);
     137        ok (result == NULL, "psPolynomial2D_dX failed as expected: cannot assign output to input");
     138
     139        psFree (poly);
    154140        skip_end();
    155141        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    … …  
    160146        psMemId id = psMemGetId();
    161147
    162         diag ("test psPolynomial2D_dY (no supplied output)");
     148        note ("test psPolynomial2D_dY (no supplied output)");
    163149
    164150        psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    208194        psMemId id = psMemGetId();
    209195
    210         diag ("test psPolynomial2D_dY (supplied output)");
     196        note ("test psPolynomial2D_dY (supplied output)");
    211197
    212198        psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    257243        psMemId id = psMemGetId();
    258244
    259         diag ("test psPolynomial2D_dY (supplied output)");
     245        note ("test psPolynomial2D_dY (supplied output)");
    260246
    261247        psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2);
    … …  
    278264        poly->mask[2][2] = 1;
    279265
    280         poly = psPolynomial2D_dY (poly, poly);
    281 
    282         ok(poly->nX == 2, "new x order is %d", poly->nX);
    283         ok(poly->nY == 1, "new y order is %d", poly->nY);
    284 
    285         ok_float(poly->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", poly->coeff[0][0]);
    286         ok_float(poly->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", poly->coeff[1][0]);
    287         ok_float(poly->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", poly->coeff[0][1]);
    288 
    289         ok(!poly->mask[0][0], "x^0 y^0 coeff is unmasked");
    290         ok(!poly->mask[1][0], "x^1 y^0 coeff is unmasked");
    291         ok(!poly->mask[0][1], "x^0 y^1 coeff is unmasked");
    292 
    293         ok(poly->mask[1][1], "x^1 y^1 coeff is masked");
    294         ok(poly->mask[1][2], "x^1 y^2 coeff is masked");
     266        psPolynomial2D *result = psPolynomial2D_dY (poly, poly);
     267        ok (result == NULL, "psPolynomial2D_dY failed as expected: cannot assign output to input");
    295268
    296269        psFree (poly);
Note: See TracChangeset for help on using the changeset viewer.