Index: trunk/psLib/src/math/psStats.c =================================================================== --- trunk/psLib/src/math/psStats.c (revision 4028) +++ trunk/psLib/src/math/psStats.c (revision 4029) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.128 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 19:25:29 $ + * @version $Revision: 1.129 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-05-25 20:26:55 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -424,6 +424,6 @@ psStats* stats) { - PS_VECTOR_CHECK_NULL(myVector, -1); - PS_PTR_CHECK_NULL(stats, -1); + PS_ASSERT_VECTOR_NON_NULL(myVector, -1); + PS_ASSERT_PTR_NON_NULL(stats, -1); psS32 i = 0; // Loop index variable @@ -472,6 +472,6 @@ psStats* stats) { - PS_VECTOR_CHECK_NULL(myVector, -1); - PS_PTR_CHECK_NULL(stats, -1); + PS_ASSERT_VECTOR_NON_NULL(myVector, -1); + PS_ASSERT_PTR_NON_NULL(stats, -1); psS32 i = 0; // Loop index variable psS32 numData = 0; // The number of data points @@ -619,6 +619,6 @@ psF32 sigma) { - PS_PTR_CHECK_NULL(robustHistogram, NULL); - PS_PTR_CHECK_NULL(robustHistogram->bounds, NULL); + PS_ASSERT_PTR_NON_NULL(robustHistogram, NULL); + PS_ASSERT_PTR_NON_NULL(robustHistogram->bounds, NULL); psS32 i = 0; // Loop index variable @@ -1029,12 +1029,12 @@ // Ensure that stats->clipIter is within the proper range. - PS_INT_CHECK_RANGE(stats->clipIter, - PS_CLIPPED_NUM_ITER_LB, - PS_CLIPPED_NUM_ITER_UB, -1); + PS_ASSERT_INT_WITHIN_RANGE(stats->clipIter, + PS_CLIPPED_NUM_ITER_LB, + PS_CLIPPED_NUM_ITER_UB, -1); // Ensure that stats->clipSigma is within the proper range. - PS_INT_CHECK_RANGE(stats->clipSigma, - PS_CLIPPED_SIGMA_LB, - PS_CLIPPED_SIGMA_UB, -1); + PS_ASSERT_INT_WITHIN_RANGE(stats->clipSigma, + PS_CLIPPED_SIGMA_LB, + PS_CLIPPED_SIGMA_UB, -1); // Allocate a psStats structure for calculating the mean, median, and @@ -1263,5 +1263,5 @@ psF32 getThisValue) { - PS_POLY_CHECK_NULL(myPoly, NAN); + PS_ASSERT_POLY_NON_NULL(myPoly, NAN); PS_FLOAT_COMPARE(rangeLow, rangeHigh, NAN); // We ensure that the requested f(y) value, which is getThisValue, is @@ -1332,11 +1332,11 @@ psF32 yVal) { - PS_VECTOR_CHECK_NULL(xVec, NAN); - PS_VECTOR_CHECK_NULL(yVec, NAN); - PS_VECTOR_CHECK_TYPE(xVec, PS_TYPE_F32, NAN); - PS_VECTOR_CHECK_TYPE(yVec, PS_TYPE_F32, NAN); - // PS_VECTOR_CHECK_SIZE_EQUAL(xVec, yVec, NAN); - PS_INT_CHECK_RANGE(binNum, 0, (xVec->n - 1), NAN); - PS_INT_CHECK_RANGE(binNum, 0, (yVec->n - 1), NAN); + PS_ASSERT_VECTOR_NON_NULL(xVec, NAN); + PS_ASSERT_VECTOR_NON_NULL(yVec, NAN); + PS_ASSERT_VECTOR_TYPE(xVec, PS_TYPE_F32, NAN); + PS_ASSERT_VECTOR_TYPE(yVec, PS_TYPE_F32, NAN); + // PS_ASSERT_VECTORS_SIZE_EQUAL(xVec, yVec, NAN); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (xVec->n - 1), NAN); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, (yVec->n - 1), NAN); // PS_VECTOR_DECLARE_ALLOC_STATIC(x, 3, PS_TYPE_F64); @@ -1827,5 +1827,5 @@ psHistogram* psHistogramAlloc(psF32 lower, psF32 upper, psS32 n) { - PS_INT_CHECK_POSITIVE(n, NULL); + PS_ASSERT_INT_POSITIVE(n, NULL); PS_FLOAT_COMPARE(lower, upper, NULL); @@ -1875,6 +1875,6 @@ psHistogram* psHistogramAllocGeneric(const psVector* bounds) { - PS_VECTOR_CHECK_NULL(bounds, NULL); - PS_VECTOR_CHECK_TYPE(bounds, PS_TYPE_F32, NULL); + PS_ASSERT_VECTOR_NON_NULL(bounds, NULL); + PS_ASSERT_VECTOR_TYPE(bounds, PS_TYPE_F32, NULL); PS_INT_COMPARE(2, bounds->n, NULL); @@ -1930,10 +1930,10 @@ psF32 error) { - PS_PTR_CHECK_NULL(out, -1); - PS_PTR_CHECK_NULL(out->bounds, -1); - PS_PTR_CHECK_NULL(out->nums, -1); - PS_INT_CHECK_RANGE(binNum, 0, ((out->nums->n)-1), -2); + PS_ASSERT_PTR_NON_NULL(out, -1); + PS_ASSERT_PTR_NON_NULL(out->bounds, -1); + PS_ASSERT_PTR_NON_NULL(out->nums, -1); + PS_ASSERT_INT_WITHIN_RANGE(binNum, 0, ((out->nums->n)-1), -2); PS_FLOAT_COMPARE(0.0, error, -3); - PS_FLOAT_CHECK_RANGE(data, out->bounds->data.F32[0], out->bounds->data.F32[(out->bounds->n)-1], -4); + PS_ASSERT_FLOAT_WITHIN_RANGE(data, out->bounds->data.F32[0], out->bounds->data.F32[(out->bounds->n)-1], -4); psF32 boxcarWidth = 2.35 * error; @@ -2019,19 +2019,19 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(out, NULL); - PS_VECTOR_CHECK_NULL(out->bounds, NULL); - PS_VECTOR_CHECK_TYPE(out->bounds, PS_TYPE_F32, NULL); - PS_INT_CHECK_NON_NEGATIVE(out->bounds->n, NULL); - PS_VECTOR_CHECK_NULL(out->nums, NULL); - PS_VECTOR_CHECK_TYPE(out->nums, PS_TYPE_F32, NULL); - PS_INT_CHECK_NON_NEGATIVE(out->nums->n, NULL); - PS_VECTOR_CHECK_NULL(in, out); + PS_ASSERT_PTR_NON_NULL(out, NULL); + PS_ASSERT_VECTOR_NON_NULL(out->bounds, NULL); + PS_ASSERT_VECTOR_TYPE(out->bounds, PS_TYPE_F32, NULL); + PS_ASSERT_INT_NONNEGATIVE(out->bounds->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(out->nums, NULL); + PS_ASSERT_VECTOR_TYPE(out->nums, PS_TYPE_F32, NULL); + PS_ASSERT_INT_NONNEGATIVE(out->nums->n, NULL); + PS_ASSERT_VECTOR_NON_NULL(in, out); if (mask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(in, mask, NULL); - PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(in, mask, NULL); + PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, NULL); } if (errors != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(in, errors, NULL); - PS_VECTOR_CHECK_TYPE(errors, in->type.type, NULL); + PS_ASSERT_VECTORS_SIZE_EQUAL(in, errors, NULL); + PS_ASSERT_VECTOR_TYPE(errors, in->type.type, NULL); } @@ -2216,13 +2216,13 @@ psU32 maskVal) { - PS_PTR_CHECK_NULL(stats, NULL); - PS_VECTOR_CHECK_NULL(in, stats); + PS_ASSERT_PTR_NON_NULL(stats, NULL); + PS_ASSERT_VECTOR_NON_NULL(in, stats); if (mask != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, stats); - PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, stats); + PS_ASSERT_VECTORS_SIZE_EQUAL(mask, in, stats); + PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, stats); } if (errors != NULL) { - PS_VECTOR_CHECK_SIZE_EQUAL(errors, in, stats); - PS_VECTOR_CHECK_TYPE(errors, in->type.type, stats); + PS_ASSERT_VECTORS_SIZE_EQUAL(errors, in, stats); + PS_ASSERT_VECTOR_TYPE(errors, in->type.type, stats); }