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:
19 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/.cvsignore

    r10597 r10848  
    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
     12
     13tap_psHist00
     14tap_psHist01
     15tap_psHist02
     16tap_psHist03
     17tap_psMD5
     18tap_psMatrix01
     19tap_psMatrix02
     20tap_psMatrix03
     21tap_psMatrix04
     22tap_psMatrix05
     23tap_psMatrix06
     24tap_psMatrix07
     25tap_psPolyFit1D
     26tap_psPolyFit2D
     27tap_psPolyFit3D
     28tap_psPolyFit4D
     29tap_psPolynomial
     30tap_psPolynomialEval1D
     31tap_psPolynomialEval2D
     32tap_psPolynomialEval3D
     33tap_psPolynomialEval4D
     34tap_psPolynomialUtils_Derivatives
    5135tap_psSparse
     36tap_psStats00
     37tap_psStats01
     38tap_psStats02
     39tap_psStats03
     40tap_psStats05
     41tap_psStats06
     42tap_psStats07
     43tap_psStats08
     44tap_psStats09
    5245tap_psStatsTiming
    53 tap_psMD5
    5446tap_psStats_Sample_01
    55 tap_psPolynomialUtils_Derivatives

  • trunk/psLib/test/math/Makefile.am

    r10597 r10848  
    1313
    1414TEST_PROGS = \
     15        tap_psHist00 \
     16        tap_psHist01 \
     17        tap_psHist02 \
     18        tap_psHist03 \
    1519        tap_psMD5 \
     20        tap_psMatrix01 \
     21        tap_psMatrix02 \
     22        tap_psMatrix03 \
     23        tap_psMatrix04 \
     24        tap_psMatrix05 \
     25        tap_psMatrix06 \
     26        tap_psMatrix07 \
     27        tap_psPolyFit1D \
     28        tap_psPolyFit2D \
     29        tap_psPolyFit3D \
     30        tap_psPolyFit4D \
     31        tap_psPolynomial \
     32        tap_psPolynomialEval1D \
     33        tap_psPolynomialEval2D \
     34        tap_psPolynomialEval3D \
     35        tap_psPolynomialEval4D \
     36        tap_psPolynomialUtils_Derivatives \
    1637        tap_psSparse \
     38        tap_psStats00 \
     39        tap_psStats01 \
     40        tap_psStats02 \
     41        tap_psStats03 \
     42        tap_psStats05 \
     43        tap_psStats06 \
     44        tap_psStats07 \
     45        tap_psStats08 \
     46        tap_psStats09 \
    1747        tap_psStatsTiming \
    18         tap_psStats_Sample_01 \
    19         tap_psPolynomialUtils_Derivatives
     48        tap_psStats_Sample_01
    2049
    2150if BUILD_TESTS
    … …  
    2958
    3059test: check
     60        $(top_srcdir)/test/test.pl

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

    r10820 r10848  
    272272    }
    273273
    274     psPolynomial1D *rc = NULL;
     274    bool rc = false;
    275275    if (flags & TS00_CLIP_FIT) {
    276276        rc = psVectorClipFitPolynomial1D(myPoly, stats, mask, MASK_VALUE, f, fErr, x);
    … …  
    279279    }
    280280
    281     if (rc == NULL) {
     281    if (!rc) {
    282282        if (expectedRC == true) {
    283283            diag("TEST ERROR: the 1D polynomial fitting function returned NULL.\n");

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

    r10820 r10848  
    279279    }
    280280
    281     psPolynomial2D *rc = NULL;
     281    bool rc = false;
    282282    if (flags & TS00_CLIP_FIT) {
    283283        rc = psVectorClipFitPolynomial2D(myPoly, stats, mask, MASK_VALUE, f, fErr, x, y);
    … …  
    286286    }
    287287
    288     if (rc == NULL) {
     288    if (!rc) {
    289289        if (expectedRC == true) {
    290290            diag("TEST ERROR: the 2D polynomial fitting function returned NULL.\n");

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

    r10820 r10848  
    324324    }
    325325
    326     psPolynomial3D *rc = NULL;
     326    bool rc = false;
    327327    if (flags & TS00_CLIP_FIT) {
    328328        rc = psVectorClipFitPolynomial3D(myPoly, stats, mask, MASK_VALUE, f, fErr, x, y, z);
    … …  
    331331    }
    332332
    333     if (rc == NULL) {
     333    if (!rc) {
    334334        if (expectedRC == true) {
    335335            diag("TEST ERROR: the 3D polynomial fitting function returned NULL.\n");

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

    r10820 r10848  
    377377    }
    378378
    379     psPolynomial4D *rc = NULL;
     379    bool rc = false;
    380380    if (flags & TS00_CLIP_FIT) {
    381381        rc = psVectorClipFitPolynomial4D(myPoly, stats, mask, MASK_VALUE, f, fErr, x, y, z, t);
    … …  
    384384    }
    385385
    386     if (rc == NULL) {
     386    if (!rc) {
    387387        if (expectedRC == true) {
    388388            diag("TEST ERROR: the 4D polynomial fitting function returned NULL.\n");

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

    r10820 r10848  
    44*  ORD and CHEB type polynomials.
    55*
    6 *  @version  $Revision: 1.1 $  $Name: not supported by cvs2svn $
    7 *  @date  $Date: 2006-12-21 20:05:12 $
     6*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
     7*  @date  $Date: 2006-12-29 04:38:42 $
    88*
    99* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    148148        psMemId id = psMemGetId();
    149149        psPolynomial2D* polyOrd = psPolynomial2DAlloc(99, TERMS-1, TERMS-1);
    150         ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
    151         skip_start(polyOrd == NULL, 2, "Skipping tests because psPolynomial2DAlloc() failed");
     150        ok(polyOrd == NULL, "Ordinary polynomial allocation successful");
     151        skip_start(polyOrd == NULL, 1, "Skipping tests because psPolynomial2DAlloc() failed");
    152152
    153153        // Attempt to evaluation invalid polynomial type

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

    r10820 r10848  
    44*  ORD and CHEB type polynomials.
    55*
    6 *  @version  $Revision: 1.1 $  $Name: not supported by cvs2svn $
    7 *  @date  $Date: 2006-12-21 20:05:12 $
     6*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
     7*  @date  $Date: 2006-12-29 04:38:42 $
    88*
    99* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    207207        psMemId id = psMemGetId();
    208208        psPolynomial3D* polyOrd = psPolynomial3DAlloc(99, TERMS-1, TERMS-1, TERMS-1);
    209         ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
    210         skip_start(polyOrd == NULL, 2, "Skipping tests because psPolynomial3DAlloc() failed");
     209        ok(polyOrd == NULL, "Ordinary polynomial allocation successful");
     210        skip_start(polyOrd == NULL, 1, "Skipping tests because psPolynomial3DAlloc() failed");
    211211
    212212        // Attempt to evaluation invalid polynomial type

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

    r10820 r10848  
    44*  ORD and CHEB type polynomials.
    55*
    6 *  @version  $Revision: 1.1 $  $Name: not supported by cvs2svn $
    7 *  @date  $Date: 2006-12-21 20:05:12 $
     6*  @version  $Revision: 1.2 $  $Name: not supported by cvs2svn $
     7*  @date  $Date: 2006-12-29 04:38:42 $
    88*
    99* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    448448        psMemId id = psMemGetId();
    449449        psPolynomial4D* polyOrd = psPolynomial4DAlloc(99, TERMS-1, TERMS-1, TERMS-1, TERMS-1);
    450         ok(polyOrd != NULL, "Ordinary polynomial allocation successful");
    451         skip_start(polyOrd == NULL, 2, "Skipping tests because psPolynomial4DAlloc() failed");
     450        ok(polyOrd == NULL, "Ordinary polynomial allocation successful");
     451        skip_start(polyOrd == NULL, 1, "Skipping tests because psPolynomial4DAlloc() failed");
    452452
    453453        // Attempt to evaluation invalid polynomial type

  • 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);

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

    r10831 r10848  
    1 @file  tst_psStats00.c
    2 *
    3 *  @brief Contains tests for psVectorStats with sample mean calculations
    4 *
    5 *  We extensively test the code with data type PS_TYPE_F32.  If these pass, we
    6 *  do
    7     a much simpler test with data type PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_F64.
    8     *
    9     *  @author GLG, MHPCC
    10     *
    11 *  @version $Revision:
    12 1.8 $  $Name:
    13     $
    14 *  @date $Date:
    15 2006/07/28 00:
    16 44:
    17     05 $
    18     *
    19     *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    20     */
    21     #include <stdio.h>
    22     #include <string.h>
    23     #include <pslib.h>
    24     #include "tap.h"
    25     #include "pstap.h"
    26 
    27     #define N 15
    28 
    29     static psF32 samplesF32[N] =
    30             {
    31                 1.1, 2.2, -3.3, 4.4, 5.5, -6.6, 7.7, 8.8, -9.9, 10.0,
    32                 11.01, -12.02, 13.03, 14.04, -15.05
    33             };
     1/** @file  tst_psStats00.c
     2 *
     3 *  @brief Contains tests for psVectorStats with sample mean calculations
     4 *
     5 
     6 *  We extensively test the code with data type PS_TYPE_F32.  If these pass, we do a much
     7 *  simpler test with data type PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_F64.
     8 *
     9 *  @author GLG, MHPCC
     10 *
     11 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2006-12-29 04:38:42 $
     13 *
     14 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
     15 */
     16
     17#include <stdio.h>
     18#include <string.h>
     19#include <pslib.h>
     20#include "tap.h"
     21#include "pstap.h"
     22
     23#define N 15
     24
     25static psF32 samplesF32[N] =
     26    {
     27        1.1, 2.2, -3.3, 4.4, 5.5, -6.6, 7.7, 8.8, -9.9, 10.0,
     28        11.01, -12.02, 13.03, 14.04, -15.05
     29    };
    3430static psS8  samplesS8[N]  =
    3531    {
    … …  
    9288    {
    9389        psMemId id = psMemGetId();
    94         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     90        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     91        ok(result, "psVectorStats suceeded");
    9592        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    9693        ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4,
    … …  
    10299    {
    103100        psMemId id = psMemGetId();
    104         myStats = psVectorStats(myStats, myVector, myErrors, NULL, 0);
     101        bool result = psVectorStats(myStats, myVector, myErrors, NULL, 0);
     102        ok(result, "psVectorStats suceeded");
    105103        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    106104        ok_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskF32);
    … …  
    114112        myStats->min = -10.0;
    115113        myStats->max =   8.0;
    116         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     114        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     115        ok(result, "psVectorStats suceeded");
    117116        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    118117        ok_float_tol(myStats->sampleMean, expectedMeanRangeNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeNoMaskF32);
    … …  
    125124        psMemId id = psMemGetId();
    126125        myStats->options = PS_STAT_SAMPLE_MEAN | PS_STAT_USE_RANGE;
    127         myStats = psVectorStats(myStats, myVector, myErrors, NULL, 0);
     126        bool result = psVectorStats(myStats, myVector, myErrors, NULL, 0);
     127        ok(result, "psVectorStats suceeded");
    128128        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    129129        ok_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskRangeF32);
    … …  
    135135        psMemId id = psMemGetId();
    136136        myStats->options = PS_STAT_SAMPLE_MEAN;
    137         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     137        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     138        ok(result, "psVectorStats suceeded");
    138139        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    139140        ok_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32);
    … …  
    144145    {
    145146        psMemId id = psMemGetId();
    146         myStats = psVectorStats(myStats, myVector, myErrors, maskVector, 1);
     147        bool result = psVectorStats(myStats, myVector, myErrors, maskVector, 1);
     148        ok(result, "psVectorStats suceeded");
    147149        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    148150        ok_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskF32);
    … …  
    154156        psMemId id = psMemGetId();
    155157        myStats->options = PS_STAT_SAMPLE_MEAN | PS_STAT_USE_RANGE;
    156         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     158        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     159        ok(result, "psVectorStats suceeded");
    157160        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    158161        ok_float_tol(myStats->sampleMean, expectedMeanRangeWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeWithMaskF32);
    … …  
    163166    {
    164167        psMemId id = psMemGetId();
    165         myStats = psVectorStats(myStats, myVector, myErrors, maskVector, 1);
     168        bool result = psVectorStats(myStats, myVector, myErrors, maskVector, 1);
     169        ok(result, "psVectorStats suceeded");
    166170        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    167171        ok_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskRangeF32);
    … …  
    178182            }
    179183        }
    180         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 2);
     184        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 2);
     185        ok(result, "psVectorStats suceeded");
    181186        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    182187        ok_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32);
    … …  
    193198            }
    194199        }
    195         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 4);
     200        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 4);
     201        ok(result, "psVectorStats suceeded");
    196202        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    197203        ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF32);
    … …  
    206212            maskVector->data.U8[i] = 1;
    207213        }
    208         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     214        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     215        ok(result, "psVectorStats suceeded");
    209216        ok(isnan(myStats->sampleMean), "psVectorStats() returned NAN");
    210217        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    … …  
    214221    {
    215222        psMemId id = psMemGetId();
    216         ok(psVectorStats(myStats, NULL, NULL, NULL, 0) == NULL, "psVectorStats() returned NULL with NULL inputs");
    217         ok(psVectorStats(NULL, myVector, NULL, NULL, 0) == NULL, "psVectorStats() returned NULL with NULL inputs");
    218         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    219     }
    220 
    221 
    222 
    223 
    224 
    225 
    226 
    227 
    228 
    229 
     223        ok(!psVectorStats(myStats, NULL, NULL, NULL, 0), "psVectorStats() returned false with NULL inputs");
     224        ok(!psVectorStats(NULL, myVector, NULL, NULL, 0), "psVectorStats() returned false with NULL inputs");
     225        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     226    }
    230227
    231228    psFree(myStats);
    … …  
    247244        }
    248245
    249         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     246        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     247        ok(result, "psVectorStats suceeded");
    250248        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    251249        ok_float_tol(myStats->sampleMean, expectedMeanNoMaskS8, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskS8);
    … …  
    267265        }
    268266
    269         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     267        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     268        ok(result, "psVectorStats suceeded");
    270269        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    271270        ok_float_tol(myStats->sampleMean, expectedMeanNoMaskU16, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskU16);
    … …  
    286285        }
    287286
    288         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     287        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     288        ok(result, "psVectorStats suceeded");
    289289        ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
    290290        ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF64, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF64);

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

    r10831 r10848  
    88*  @author GLG, MHPCC
    99*
    10 *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    11 *  @date $Date: 2006-12-26 20:33:55 $
     10*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     11*  @date $Date: 2006-12-29 04:38:42 $
    1212*
    1313* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    6060    {
    6161        psMemId id = psMemGetId();
    62         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     62        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     63        ok(result, "psVectorStats suceeded");
    6364        ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
    6465        ok_float_tol(myStats->max, expectedMaxNoMaskF32, 1e-4,
    … …  
    7071    {
    7172        psMemId id = psMemGetId();
    72         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     73        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     74        ok(result, "psVectorStats suceeded");
    7375        ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
    7476        ok_float_tol(myStats->max, expectedMaxWithMaskF32, 1e-4,
    … …  
    8385        myStats->max = 10.2;
    8486        myStats->min = 0.0;
    85         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     87        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     88        ok(result, "psVectorStats suceeded");
    8689        ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
    8790        ok_float_tol(myStats->max, expectedMaxRangeNoMaskF32, 1e-4,
    … …  
    9598        myStats->max = 14.0;
    9699        myStats->min = 0.0;
    97         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     100        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     101        ok(result, "psVectorStats suceeded");
    98102        ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
    99103        ok_float_tol(myStats->max, expectedMaxRangeWithMaskF32, 1e-4,
    … …  
    107111        myStats->max = 100.00;
    108112        myStats->min = 90.00;
    109         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     113        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     114        ok(!result, "psVectorStats failed as expected");
    110115        ok(isnan(myStats->max), "psVectorStats() returned NAN");
    111116        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    … …  
    128133        }
    129134
    130         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     135        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     136        ok(result, "psVectorStats suceeded");
    131137        ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
    132138        ok_float_tol(myStats->max, expectedMaxNoMaskS8, 1e-4,
    … …  
    148154        }
    149155
    150         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     156        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     157        ok(result, "psVectorStats suceeded");
    151158        ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
    152159        ok_float_tol(myStats->max, expectedMaxNoMaskU16, 1e-4,
    … …  
    168175        }
    169176
    170         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     177        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     178        ok(result, "psVectorStats suceeded");
    171179        ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
    172180        ok_float_tol(myStats->max, expectedMaxNoMaskF64, 1e-4,

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

    r10831 r10848  
    1111*  @author GLG, MHPCC
    1212*
    13 *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    14 *  @date $Date: 2006-12-26 20:33:55 $
     13*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     14*  @date $Date: 2006-12-29 04:38:42 $
    1515*
    1616* Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
    … …  
    6464    {
    6565        psMemId id = psMemGetId();
    66         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     66        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     67        ok(result, "psVectorStats suceeded");
    6768        ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
    6869        ok_float_tol(myStats->min, expectedMinNoMaskF32, 1e-4,
    … …  
    7677    {
    7778        psMemId id = psMemGetId();
    78         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     79        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     80        ok(result, "psVectorStats suceeded");
    7981        ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
    8082        ok_float_tol(myStats->min, expectedMinWithMaskF32, 1e-4,
    … …  
    8991        myStats->max = 10.2;
    9092        myStats->min = 0.0;
    91         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     93        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     94        ok(result, "psVectorStats suceeded");
    9295        ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
    9396        ok_float_tol(myStats->min, expectedMinRangeNoMaskF32, 1e-4,
    … …  
    101104        myStats->max = 10.1;
    102105        myStats->min = -15.00;
    103         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     106        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     107        ok(result, "psVectorStats succeeded");
    104108        ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
    105109        ok_float_tol(myStats->min, expectedMinRangeWithMaskF32, 1e-4,
    … …  
    113117        myStats->max = 100.00;
    114118        myStats->min = 90.00;
    115         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     119        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     120        ok(!result, "psVectorStats failed as expected");
    116121        ok(isnan(myStats->min), "psVectorStats() returned NAN");
    117122        ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
    … …  
    134139        }
    135140
    136         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     141        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     142        ok(result, "psVectorStats succeeded");
    137143        ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
    138144        ok_float_tol(myStats->min, expectedMinNoMaskS8, 1e-4,
    … …  
    154160        }
    155161
    156         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     162        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     163        ok(result, "psVectorStats succeeded");
    157164        ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
    158165        ok_float_tol(myStats->min, expectedMinNoMaskU16, 1e-4,
    … …  
    174181        }
    175182
    176         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     183        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     184        ok(result, "psVectorStats succeeded");
    177185        ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
    178186        ok_float_tol(myStats->min, expectedMinNoMaskF64, 1e-4,

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

    r10831 r10848  
    4141    {
    4242        psMemId id = psMemGetId();
    43         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     43        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     44        ok(result, "psVectorStats succeeded");
    4445        ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN");
    4546        ok_float_tol(myStats->sampleMedian, realMedianNoMask, 1e-4,
    … …  
    5152    {
    5253        psMemId id = psMemGetId();
    53         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     54        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     55        ok(result, "psVectorStats succeeded");
    5456        ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN");
    5557        ok_float_tol(myStats->sampleMedian, realMedianWithMask, 1e-4,

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

    r10831 r10848  
    4242    {
    4343        psMemId id = psMemGetId();
    44         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     44        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     45        ok(result, "psVectorStats succeeded");
    4546        ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN");
    4647        ok_float_tol(myStats->sampleStdev, realStdevNoMask, 1e-4,
    … …  
    5253    {
    5354        psMemId id = psMemGetId();
    54         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     55        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     56        ok(result, "psVectorStats succeeded");
    5557        ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN");
    5658        ok_float_tol(myStats->sampleStdev, realStdevWithMask, 1e-4,

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

    r10831 r10848  
    314314    if (expectedRC == true) {
    315315        psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV | PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_QUARTILE);
    316         psStats *rc = psVectorStats(myStats, in, NULL, NULL, maskValue);
    317         if (rc == NULL) {
     316        bool rc = psVectorStats(myStats, in, NULL, NULL, maskValue);
     317        if (rc == false) {
    318318            diag("TEST ERROR: the psVectorStats() function returned NULL.\n");
    319319            testStatus = false;
    … …  
    406406                           PS_STAT_FITTED_MEAN |
    407407                           PS_STAT_FITTED_STDEV);
    408     psStats *rc = psVectorStats(myStats, in, errors, mask, maskValue);
    409 
    410     if (rc == NULL) {
     408    bool rc = psVectorStats(myStats, in, errors, mask, maskValue);
     409
     410    if (rc == false) {
    411411        if (expectedRC == true) {
    412412            diag("TEST ERROR: the psVectorStats() function returned NULL.\n");

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

    r10831 r10848  
    4242    {
    4343        psMemId id = psMemGetId();
    44         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     44        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     45        ok(result, "psVectorStats succeeded");
    4546        ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN");
    4647        ok_float_tol(myStats->sampleLQ, realLQNoMask, 1e-4,
    … …  
    5253    {
    5354        psMemId id = psMemGetId();
    54         myStats = psVectorStats(myStats, myVector, NULL, NULL, 0);
     55        bool result = psVectorStats(myStats, myVector, NULL, NULL, 0);
     56        ok(result, "psVectorStats succeeded");
    5557        ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN");
    5658        ok_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4,
    … …  
    6264    {
    6365        psMemId id = psMemGetId();
    64         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     66        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     67        ok(result, "psVectorStats succeeded");
    6568        ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN");
    6669        ok_float_tol(myStats->sampleLQ, realLQWithMask, 1e-4,
    … …  
    7275    {
    7376        psMemId id = psMemGetId();
    74         myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     77        bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     78        ok(result, "psVectorStats succeeded");
    7579        ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN");
    7680        ok_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4,

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

    r10831 r10848  
    280280    if (expectedRC == true) {
    281281        psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV);
    282         psStats *rc = psVectorStats(myStats, in, errors, outliers, 1);
    283         if (rc == NULL) {
     282        bool rc = psVectorStats(myStats, in, errors, outliers, 1);
     283        if (rc == false) {
    284284            diag("TEST ERROR: the psVectorStats() function returned NULL.\n");
    285285            testStatus = false;
    … …  
    298298    myStats->clipSigma = 5.0;
    299299    myStats->clipIter = 2;
    300     psStats *rc = psVectorStats(myStats, in, errors, mask, maskValue);
    301     if (rc == NULL) {
     300    bool rc = psVectorStats(myStats, in, errors, mask, maskValue);
     301    if (rc == false) {
    302302        if (expectedRC == true) {
    303303            diag("TEST ERROR: the psVectorStats() function returned NULL.\n");
Note: See TracChangeset for help on using the changeset viewer.