Index: trunk/psLib/test/math/.cvsignore =================================================================== --- trunk/psLib/test/math/.cvsignore (revision 10831) +++ trunk/psLib/test/math/.cvsignore (revision 10848) @@ -4,52 +4,43 @@ Makefile Makefile.in -tst_psFunc01 -tst_psHist00 -tst_psHist01 -tst_psHist02 -tst_psHist03 -tst_psMatrix01 -tst_psMatrix02 -tst_psMatrix03 -tst_psMatrix04 -tst_psMatrix05 -tst_psMatrix06 -tst_psMatrix07 -tst_psMatrixVectorArithmetic01 -tst_psMatrixVectorArithmetic02 -tst_psMatrixVectorArithmetic03 -tst_psMatrixVectorArithmetic04 -tst_psRandom -tst_psStats00 -tst_psStats01 -tst_psStats02 -tst_psStats03 -tst_psStats05 -tst_psStats06 -tst_psStats07 -tst_psStats08 -tst_psStats09 seed_msglog1.txt seed_msglog2.txt -tst_psSpline1D -tst_psMathUtils -tst_psMinimizeLMM -tst_psMinimizePowell -tst_psPolyFit1D -tst_psPolyFit2D -tst_psPolyFit3D -tst_psPolyFit4D -tst_psPolynomial -tst_psPolynomialEval1D -tst_psPolynomialEval2D -tst_psPolynomialEval3D -tst_psPolynomialEval4D *.bb *.bbg *.da gmon.out + +tap_psHist00 +tap_psHist01 +tap_psHist02 +tap_psHist03 +tap_psMD5 +tap_psMatrix01 +tap_psMatrix02 +tap_psMatrix03 +tap_psMatrix04 +tap_psMatrix05 +tap_psMatrix06 +tap_psMatrix07 +tap_psPolyFit1D +tap_psPolyFit2D +tap_psPolyFit3D +tap_psPolyFit4D +tap_psPolynomial +tap_psPolynomialEval1D +tap_psPolynomialEval2D +tap_psPolynomialEval3D +tap_psPolynomialEval4D +tap_psPolynomialUtils_Derivatives tap_psSparse +tap_psStats00 +tap_psStats01 +tap_psStats02 +tap_psStats03 +tap_psStats05 +tap_psStats06 +tap_psStats07 +tap_psStats08 +tap_psStats09 tap_psStatsTiming -tap_psMD5 tap_psStats_Sample_01 -tap_psPolynomialUtils_Derivatives Index: trunk/psLib/test/math/Makefile.am =================================================================== --- trunk/psLib/test/math/Makefile.am (revision 10831) +++ trunk/psLib/test/math/Makefile.am (revision 10848) @@ -13,9 +13,38 @@ TEST_PROGS = \ + tap_psHist00 \ + tap_psHist01 \ + tap_psHist02 \ + tap_psHist03 \ tap_psMD5 \ + tap_psMatrix01 \ + tap_psMatrix02 \ + tap_psMatrix03 \ + tap_psMatrix04 \ + tap_psMatrix05 \ + tap_psMatrix06 \ + tap_psMatrix07 \ + tap_psPolyFit1D \ + tap_psPolyFit2D \ + tap_psPolyFit3D \ + tap_psPolyFit4D \ + tap_psPolynomial \ + tap_psPolynomialEval1D \ + tap_psPolynomialEval2D \ + tap_psPolynomialEval3D \ + tap_psPolynomialEval4D \ + tap_psPolynomialUtils_Derivatives \ tap_psSparse \ + tap_psStats00 \ + tap_psStats01 \ + tap_psStats02 \ + tap_psStats03 \ + tap_psStats05 \ + tap_psStats06 \ + tap_psStats07 \ + tap_psStats08 \ + tap_psStats09 \ tap_psStatsTiming \ - tap_psStats_Sample_01 \ - tap_psPolynomialUtils_Derivatives + tap_psStats_Sample_01 if BUILD_TESTS @@ -29,2 +58,3 @@ test: check + $(top_srcdir)/test/test.pl Index: trunk/psLib/test/math/tap_psPolyFit1D.c =================================================================== --- trunk/psLib/test/math/tap_psPolyFit1D.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolyFit1D.c (revision 10848) @@ -272,5 +272,5 @@ } - psPolynomial1D *rc = NULL; + bool rc = false; if (flags & TS00_CLIP_FIT) { rc = psVectorClipFitPolynomial1D(myPoly, stats, mask, MASK_VALUE, f, fErr, x); @@ -279,5 +279,5 @@ } - if (rc == NULL) { + if (!rc) { if (expectedRC == true) { diag("TEST ERROR: the 1D polynomial fitting function returned NULL.\n"); Index: trunk/psLib/test/math/tap_psPolyFit2D.c =================================================================== --- trunk/psLib/test/math/tap_psPolyFit2D.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolyFit2D.c (revision 10848) @@ -279,5 +279,5 @@ } - psPolynomial2D *rc = NULL; + bool rc = false; if (flags & TS00_CLIP_FIT) { rc = psVectorClipFitPolynomial2D(myPoly, stats, mask, MASK_VALUE, f, fErr, x, y); @@ -286,5 +286,5 @@ } - if (rc == NULL) { + if (!rc) { if (expectedRC == true) { diag("TEST ERROR: the 2D polynomial fitting function returned NULL.\n"); Index: trunk/psLib/test/math/tap_psPolyFit3D.c =================================================================== --- trunk/psLib/test/math/tap_psPolyFit3D.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolyFit3D.c (revision 10848) @@ -324,5 +324,5 @@ } - psPolynomial3D *rc = NULL; + bool rc = false; if (flags & TS00_CLIP_FIT) { rc = psVectorClipFitPolynomial3D(myPoly, stats, mask, MASK_VALUE, f, fErr, x, y, z); @@ -331,5 +331,5 @@ } - if (rc == NULL) { + if (!rc) { if (expectedRC == true) { diag("TEST ERROR: the 3D polynomial fitting function returned NULL.\n"); Index: trunk/psLib/test/math/tap_psPolyFit4D.c =================================================================== --- trunk/psLib/test/math/tap_psPolyFit4D.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolyFit4D.c (revision 10848) @@ -377,5 +377,5 @@ } - psPolynomial4D *rc = NULL; + bool rc = false; if (flags & TS00_CLIP_FIT) { rc = psVectorClipFitPolynomial4D(myPoly, stats, mask, MASK_VALUE, f, fErr, x, y, z, t); @@ -384,5 +384,5 @@ } - if (rc == NULL) { + if (!rc) { if (expectedRC == true) { diag("TEST ERROR: the 4D polynomial fitting function returned NULL.\n"); Index: trunk/psLib/test/math/tap_psPolynomialEval2D.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialEval2D.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolynomialEval2D.c (revision 10848) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-12-21 20:05:12 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-12-29 04:38:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -148,6 +148,6 @@ psMemId id = psMemGetId(); psPolynomial2D* polyOrd = psPolynomial2DAlloc(99, TERMS-1, TERMS-1); - ok(polyOrd != NULL, "Ordinary polynomial allocation successful"); - skip_start(polyOrd == NULL, 2, "Skipping tests because psPolynomial2DAlloc() failed"); + ok(polyOrd == NULL, "Ordinary polynomial allocation successful"); + skip_start(polyOrd == NULL, 1, "Skipping tests because psPolynomial2DAlloc() failed"); // Attempt to evaluation invalid polynomial type Index: trunk/psLib/test/math/tap_psPolynomialEval3D.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialEval3D.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolynomialEval3D.c (revision 10848) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-12-21 20:05:12 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-12-29 04:38:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -207,6 +207,6 @@ psMemId id = psMemGetId(); psPolynomial3D* polyOrd = psPolynomial3DAlloc(99, TERMS-1, TERMS-1, TERMS-1); - ok(polyOrd != NULL, "Ordinary polynomial allocation successful"); - skip_start(polyOrd == NULL, 2, "Skipping tests because psPolynomial3DAlloc() failed"); + ok(polyOrd == NULL, "Ordinary polynomial allocation successful"); + skip_start(polyOrd == NULL, 1, "Skipping tests because psPolynomial3DAlloc() failed"); // Attempt to evaluation invalid polynomial type Index: trunk/psLib/test/math/tap_psPolynomialEval4D.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialEval4D.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolynomialEval4D.c (revision 10848) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-12-21 20:05:12 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-12-29 04:38:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -448,6 +448,6 @@ psMemId id = psMemGetId(); psPolynomial4D* polyOrd = psPolynomial4DAlloc(99, TERMS-1, TERMS-1, TERMS-1, TERMS-1); - ok(polyOrd != NULL, "Ordinary polynomial allocation successful"); - skip_start(polyOrd == NULL, 2, "Skipping tests because psPolynomial4DAlloc() failed"); + ok(polyOrd == NULL, "Ordinary polynomial allocation successful"); + skip_start(polyOrd == NULL, 1, "Skipping tests because psPolynomial4DAlloc() failed"); // Attempt to evaluation invalid polynomial type Index: trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c =================================================================== --- trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 10831) +++ trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c (revision 10848) @@ -8,7 +8,7 @@ int main (void) { - plan_tests(72); - - diag("psPolynomial2D Derivative tests"); + plan_tests(54); + + note("psPolynomial2D Derivative tests"); // test psPolynomial2D_dX (no supplied output) @@ -16,5 +16,5 @@ psMemId id = psMemGetId(); - diag ("test psPolynomial2D_dX (no supplied output)"); + note ("test psPolynomial2D_dX (no supplied output)"); psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -64,5 +64,5 @@ psMemId id = psMemGetId(); - diag ("test psPolynomial2D_dX (supplied output)"); + note ("test psPolynomial2D_dX (supplied output)"); psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -113,5 +113,5 @@ psMemId id = psMemGetId(); - diag ("test psPolynomial2D_dX (supplied output)"); + note ("test psPolynomial2D_dX (supplied output)"); psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -134,22 +134,8 @@ poly->mask[2][2] = 1; - poly = psPolynomial2D_dX (poly, poly); - - ok(poly->nX == 1, "new x order is %d", poly->nX); - ok(poly->nY == 2, "new y order is %d", poly->nY); - - ok_float(poly->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", poly->coeff[0][0]); - ok_float(poly->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", poly->coeff[1][0]); - ok_float(poly->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", poly->coeff[0][1]); - - ok(!poly->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!poly->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!poly->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(poly->mask[1][1], "x^1 y^1 coeff is masked"); - ok(poly->mask[1][2], "x^1 y^2 coeff is masked"); - - psFree (poly); - + psPolynomial2D *result = psPolynomial2D_dX (poly, poly); + ok (result == NULL, "psPolynomial2D_dX failed as expected: cannot assign output to input"); + + psFree (poly); skip_end(); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -160,5 +146,5 @@ psMemId id = psMemGetId(); - diag ("test psPolynomial2D_dY (no supplied output)"); + note ("test psPolynomial2D_dY (no supplied output)"); psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -208,5 +194,5 @@ psMemId id = psMemGetId(); - diag ("test psPolynomial2D_dY (supplied output)"); + note ("test psPolynomial2D_dY (supplied output)"); psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -257,5 +243,5 @@ psMemId id = psMemGetId(); - diag ("test psPolynomial2D_dY (supplied output)"); + note ("test psPolynomial2D_dY (supplied output)"); psPolynomial2D *poly = psPolynomial2DAlloc(PS_POLYNOMIAL_ORD, 2, 2); @@ -278,19 +264,6 @@ poly->mask[2][2] = 1; - poly = psPolynomial2D_dY (poly, poly); - - ok(poly->nX == 2, "new x order is %d", poly->nX); - ok(poly->nY == 1, "new y order is %d", poly->nY); - - ok_float(poly->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", poly->coeff[0][0]); - ok_float(poly->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", poly->coeff[1][0]); - ok_float(poly->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", poly->coeff[0][1]); - - ok(!poly->mask[0][0], "x^0 y^0 coeff is unmasked"); - ok(!poly->mask[1][0], "x^1 y^0 coeff is unmasked"); - ok(!poly->mask[0][1], "x^0 y^1 coeff is unmasked"); - - ok(poly->mask[1][1], "x^1 y^1 coeff is masked"); - ok(poly->mask[1][2], "x^1 y^2 coeff is masked"); + psPolynomial2D *result = psPolynomial2D_dY (poly, poly); + ok (result == NULL, "psPolynomial2D_dY failed as expected: cannot assign output to input"); psFree (poly); Index: trunk/psLib/test/math/tap_psStats00.c =================================================================== --- trunk/psLib/test/math/tap_psStats00.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats00.c (revision 10848) @@ -1,35 +1,31 @@ -@file tst_psStats00.c -* -* @brief Contains tests for psVectorStats with sample mean calculations -* -* We extensively test the code with data type PS_TYPE_F32. If these pass, we -* do - a much simpler test with data type PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_F64. - * - * @author GLG, MHPCC - * -* @version $Revision: -1.8 $ $Name: - $ -* @date $Date: -2006/07/28 00: -44: - 05 $ - * - * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii - */ - #include - #include - #include - #include "tap.h" - #include "pstap.h" - - #define N 15 - - static psF32 samplesF32[N] = - { - 1.1, 2.2, -3.3, 4.4, 5.5, -6.6, 7.7, 8.8, -9.9, 10.0, - 11.01, -12.02, 13.03, 14.04, -15.05 - }; +/** @file tst_psStats00.c + * + * @brief Contains tests for psVectorStats with sample mean calculations + * + + * We extensively test the code with data type PS_TYPE_F32. If these pass, we do a much + * simpler test with data type PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_F64. + * + * @author GLG, MHPCC + * + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-12-29 04:38:42 $ + * + * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii + */ + +#include +#include +#include +#include "tap.h" +#include "pstap.h" + +#define N 15 + +static psF32 samplesF32[N] = + { + 1.1, 2.2, -3.3, 4.4, 5.5, -6.6, 7.7, 8.8, -9.9, 10.0, + 11.01, -12.02, 13.03, 14.04, -15.05 + }; static psS8 samplesS8[N] = { @@ -92,5 +88,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, @@ -102,5 +99,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, myErrors, NULL, 0); + bool result = psVectorStats(myStats, myVector, myErrors, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskF32); @@ -114,5 +112,6 @@ myStats->min = -10.0; myStats->max = 8.0; - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanRangeNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeNoMaskF32); @@ -125,5 +124,6 @@ psMemId id = psMemGetId(); myStats->options = PS_STAT_SAMPLE_MEAN | PS_STAT_USE_RANGE; - myStats = psVectorStats(myStats, myVector, myErrors, NULL, 0); + bool result = psVectorStats(myStats, myVector, myErrors, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskRangeF32); @@ -135,5 +135,6 @@ psMemId id = psMemGetId(); myStats->options = PS_STAT_SAMPLE_MEAN; - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32); @@ -144,5 +145,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, myErrors, maskVector, 1); + bool result = psVectorStats(myStats, myVector, myErrors, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskF32); @@ -154,5 +156,6 @@ psMemId id = psMemGetId(); myStats->options = PS_STAT_SAMPLE_MEAN | PS_STAT_USE_RANGE; - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanRangeWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeWithMaskF32); @@ -163,5 +166,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, myErrors, maskVector, 1); + bool result = psVectorStats(myStats, myVector, myErrors, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskRangeF32); @@ -178,5 +182,6 @@ } } - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 2); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 2); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32); @@ -193,5 +198,6 @@ } } - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 4); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 4); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF32); @@ -206,5 +212,6 @@ maskVector->data.U8[i] = 1; } - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(isnan(myStats->sampleMean), "psVectorStats() returned NAN"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -214,18 +221,8 @@ { psMemId id = psMemGetId(); - ok(psVectorStats(myStats, NULL, NULL, NULL, 0) == NULL, "psVectorStats() returned NULL with NULL inputs"); - ok(psVectorStats(NULL, myVector, NULL, NULL, 0) == NULL, "psVectorStats() returned NULL with NULL inputs"); - ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); - } - - - - - - - - - - + ok(!psVectorStats(myStats, NULL, NULL, NULL, 0), "psVectorStats() returned false with NULL inputs"); + ok(!psVectorStats(NULL, myVector, NULL, NULL, 0), "psVectorStats() returned false with NULL inputs"); + ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); + } psFree(myStats); @@ -247,5 +244,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanNoMaskS8, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskS8); @@ -267,5 +265,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanNoMaskU16, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskU16); @@ -286,5 +285,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF64, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF64); Index: trunk/psLib/test/math/tap_psStats01.c =================================================================== --- trunk/psLib/test/math/tap_psStats01.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats01.c (revision 10848) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-12-26 20:33:55 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-12-29 04:38:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -60,5 +60,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->max, expectedMaxNoMaskF32, 1e-4, @@ -70,5 +71,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->max, expectedMaxWithMaskF32, 1e-4, @@ -83,5 +85,6 @@ myStats->max = 10.2; myStats->min = 0.0; - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->max, expectedMaxRangeNoMaskF32, 1e-4, @@ -95,5 +98,6 @@ myStats->max = 14.0; myStats->min = 0.0; - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->max, expectedMaxRangeWithMaskF32, 1e-4, @@ -107,5 +111,6 @@ myStats->max = 100.00; myStats->min = 90.00; - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(!result, "psVectorStats failed as expected"); ok(isnan(myStats->max), "psVectorStats() returned NAN"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -128,5 +133,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->max, expectedMaxNoMaskS8, 1e-4, @@ -148,5 +154,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->max, expectedMaxNoMaskU16, 1e-4, @@ -168,5 +175,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->max), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->max, expectedMaxNoMaskF64, 1e-4, Index: trunk/psLib/test/math/tap_psStats02.c =================================================================== --- trunk/psLib/test/math/tap_psStats02.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats02.c (revision 10848) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-12-26 20:33:55 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-12-29 04:38:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -64,5 +64,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->min, expectedMinNoMaskF32, 1e-4, @@ -76,5 +77,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->min, expectedMinWithMaskF32, 1e-4, @@ -89,5 +91,6 @@ myStats->max = 10.2; myStats->min = 0.0; - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats suceeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->min, expectedMinRangeNoMaskF32, 1e-4, @@ -101,5 +104,6 @@ myStats->max = 10.1; myStats->min = -15.00; - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->min, expectedMinRangeWithMaskF32, 1e-4, @@ -113,5 +117,6 @@ myStats->max = 100.00; myStats->min = 90.00; - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(!result, "psVectorStats failed as expected"); ok(isnan(myStats->min), "psVectorStats() returned NAN"); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -134,5 +139,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->min, expectedMinNoMaskS8, 1e-4, @@ -154,5 +160,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->min, expectedMinNoMaskU16, 1e-4, @@ -174,5 +181,6 @@ } - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->min), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->min, expectedMinNoMaskF64, 1e-4, Index: trunk/psLib/test/math/tap_psStats03.c =================================================================== --- trunk/psLib/test/math/tap_psStats03.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats03.c (revision 10848) @@ -41,5 +41,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMedian, realMedianNoMask, 1e-4, @@ -51,5 +52,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleMedian, realMedianWithMask, 1e-4, Index: trunk/psLib/test/math/tap_psStats06.c =================================================================== --- trunk/psLib/test/math/tap_psStats06.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats06.c (revision 10848) @@ -42,5 +42,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleStdev, realStdevNoMask, 1e-4, @@ -52,5 +53,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleStdev, realStdevWithMask, 1e-4, Index: trunk/psLib/test/math/tap_psStats07.c =================================================================== --- trunk/psLib/test/math/tap_psStats07.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats07.c (revision 10848) @@ -314,6 +314,6 @@ if (expectedRC == true) { psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV | PS_STAT_SAMPLE_MEDIAN | PS_STAT_SAMPLE_QUARTILE); - psStats *rc = psVectorStats(myStats, in, NULL, NULL, maskValue); - if (rc == NULL) { + bool rc = psVectorStats(myStats, in, NULL, NULL, maskValue); + if (rc == false) { diag("TEST ERROR: the psVectorStats() function returned NULL.\n"); testStatus = false; @@ -406,7 +406,7 @@ PS_STAT_FITTED_MEAN | PS_STAT_FITTED_STDEV); - psStats *rc = psVectorStats(myStats, in, errors, mask, maskValue); - - if (rc == NULL) { + bool rc = psVectorStats(myStats, in, errors, mask, maskValue); + + if (rc == false) { if (expectedRC == true) { diag("TEST ERROR: the psVectorStats() function returned NULL.\n"); Index: trunk/psLib/test/math/tap_psStats08.c =================================================================== --- trunk/psLib/test/math/tap_psStats08.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats08.c (revision 10848) @@ -42,5 +42,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleLQ, realLQNoMask, 1e-4, @@ -52,5 +53,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, NULL, 0); + bool result = psVectorStats(myStats, myVector, NULL, NULL, 0); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4, @@ -62,5 +64,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleLQ, realLQWithMask, 1e-4, @@ -72,5 +75,6 @@ { psMemId id = psMemGetId(); - myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1); + bool result = psVectorStats(myStats, myVector, NULL, maskVector, 1); + ok(result, "psVectorStats succeeded"); ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN"); ok_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4, Index: trunk/psLib/test/math/tap_psStats09.c =================================================================== --- trunk/psLib/test/math/tap_psStats09.c (revision 10831) +++ trunk/psLib/test/math/tap_psStats09.c (revision 10848) @@ -280,6 +280,6 @@ if (expectedRC == true) { psStats *myStats = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV); - psStats *rc = psVectorStats(myStats, in, errors, outliers, 1); - if (rc == NULL) { + bool rc = psVectorStats(myStats, in, errors, outliers, 1); + if (rc == false) { diag("TEST ERROR: the psVectorStats() function returned NULL.\n"); testStatus = false; @@ -298,6 +298,6 @@ myStats->clipSigma = 5.0; myStats->clipIter = 2; - psStats *rc = psVectorStats(myStats, in, errors, mask, maskValue); - if (rc == NULL) { + bool rc = psVectorStats(myStats, in, errors, mask, maskValue); + if (rc == false) { if (expectedRC == true) { diag("TEST ERROR: the psVectorStats() function returned NULL.\n");