Index: trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c
===================================================================
--- trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psPolynomialUtils_Derivatives.c	(revision 12607)
@@ -42,7 +42,7 @@
         ok(dX->nY == 2, "new y order is %d", dX->nY);
 
-        ok_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]);
-        ok_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]);
-        ok_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]);
+        is_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]);
+        is_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]);
+        is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]);
 
         ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked");
@@ -91,7 +91,7 @@
         ok(dX->nY == 2, "new y order is %d", dX->nY);
 
-        ok_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]);
-        ok_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]);
-        ok_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]);
+        is_float(dX->coeff[0][0], +2.0, "x^0 y^0 coeff is %f", dX->coeff[0][0]);
+        is_float(dX->coeff[1][0], -6.0, "x^1 y^0 coeff is %f", dX->coeff[1][0]);
+        is_float(dX->coeff[0][1], +4.0, "x^0 y^1 coeff is %f", dX->coeff[0][1]);
 
         ok(!dX->mask[0][0], "x^0 y^0 coeff is unmasked");
@@ -172,7 +172,7 @@
         ok(dY->nY == 1, "new y order is %d", dY->nY);
 
-        ok_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]);
-        ok_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]);
-        ok_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]);
+        is_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]);
+        is_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]);
+        is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]);
 
         ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked");
@@ -221,7 +221,7 @@
         ok(dY->nY == 1, "new y order is %d", dY->nY);
 
-        ok_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]);
-        ok_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]);
-        ok_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]);
+        is_float(dY->coeff[0][0], +3.0, "x^0 y^0 coeff is %f", dY->coeff[0][0]);
+        is_float(dY->coeff[1][0], +4.0, "x^1 y^0 coeff is %f", dY->coeff[1][0]);
+        is_float(dY->coeff[0][1], -4.0, "x^0 y^1 coeff is %f", dY->coeff[0][1]);
 
         ok(!dY->mask[0][0], "x^0 y^0 coeff is unmasked");
Index: trunk/psLib/test/math/tap_psRandom.c
===================================================================
--- trunk/psLib/test/math/tap_psRandom.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psRandom.c	(revision 12607)
@@ -39,5 +39,5 @@
 #define ERROR_TOLERANCE 0.2
 #define VERBOSE 0
-# define ok_float_tol_per(VALUE,EXPECT,TOL,COMMENT, ...)\
+# define is_float_tol_per(VALUE,EXPECT,TOL,COMMENT, ...)\
 ok((fabs((VALUE)-(EXPECT)) < (TOL)), COMMENT, ## __VA_ARGS__);
 
@@ -102,6 +102,6 @@
 
         // Verify mean and stdev
-        ok_float_tol_per(stats->sampleMean, UNIFORM_MEAN, ERROR_TOLERANCE, "Mean is within expected range");
-        ok_float_tol_per(stats->sampleStdev, UNIFORM_STDEV, ERROR_TOLERANCE, "StDev is within expected range");
+        is_float_tol_per(stats->sampleMean, UNIFORM_MEAN, ERROR_TOLERANCE, "Mean is within expected range");
+        is_float_tol_per(stats->sampleStdev, UNIFORM_STDEV, ERROR_TOLERANCE, "StDev is within expected range");
 
         skip_end();
@@ -143,6 +143,6 @@
 
         // Verify mean and stdev
-        ok_float_tol_per(stats->sampleMean, GAUSSIAN_MEAN, ERROR_TOLERANCE, "Mean is within expected range");
-        ok_float_tol_per(stats->sampleStdev, GAUSSIAN_STDEV, ERROR_TOLERANCE, "StDev is within expected range");
+        is_float_tol_per(stats->sampleMean, GAUSSIAN_MEAN, ERROR_TOLERANCE, "Mean is within expected range");
+        is_float_tol_per(stats->sampleStdev, GAUSSIAN_STDEV, ERROR_TOLERANCE, "StDev is within expected range");
 
         skip_end();
@@ -185,6 +185,6 @@
         stats = psVectorStats(stats, rans, NULL, NULL, 0);
         // Verify mean and stdev
-        ok_float_tol_per(stats->sampleMean, POISSON_MEAN, ERROR_TOLERANCE, "Mean is within expected range");
-        ok_float_tol_per(stats->sampleStdev, POISSON_STDEV, ERROR_TOLERANCE, "StDev is within expected range");
+        is_float_tol_per(stats->sampleMean, POISSON_MEAN, ERROR_TOLERANCE, "Mean is within expected range");
+        is_float_tol_per(stats->sampleStdev, POISSON_STDEV, ERROR_TOLERANCE, "StDev is within expected range");
 
         skip_end();
Index: trunk/psLib/test/math/tap_psSparse.c
===================================================================
--- trunk/psLib/test/math/tap_psSparse.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psSparse.c	(revision 12607)
@@ -74,5 +74,5 @@
         dS2 = sqrt (dS2/100.0 - dS*dS);
 
-        ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
+        is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
 
         psFree (matrix);
@@ -147,5 +147,5 @@
         dS2 = sqrt (dS2/100.0 - dS*dS);
 
-        ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
+        is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
 
         psFree (matrix);
@@ -219,19 +219,19 @@
         // test the support functions: LowerProduct
         fVec = psSparseBorderLowerProduct (NULL, border, xRef);
-        ok_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
-        ok_float (fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
+        is_float (fVec->data.F32[0], 0.3, "f(0): %f", fVec->data.F32[0]);
         psFree (fVec);
 
         // test the support functions: Upper Product
         fVec = psSparseBorderUpperProduct (NULL, border, yRef);
-        ok_float (fVec->n, 2.0, "f dimen: %d", fVec->n);
-        ok_float (fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]);
-        ok_float (fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]);
+        is_float (fVec->n, 2.0, "f dimen: %d", fVec->n);
+        is_float (fVec->data.F32[0], 0.05, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->data.F32[1], 0.10, "f(0): %f", fVec->data.F32[1]);
         psFree (fVec);
 
         // test the support functions: Square Product
         fVec = psSparseBorderSquareProduct (NULL, border, yRef);
-        ok_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
-        ok_float (fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->n, 1.0, "f dimen: %d", fVec->n);
+        is_float (fVec->data.F32[0], 0.25, "f(0): %f", fVec->data.F32[0]);
         psFree (fVec);
 
@@ -239,7 +239,7 @@
         psVector *gVec = NULL;
         psSparseBorderMultiply (&fVec, &gVec, border, xRef, yRef);
-        ok_float (fVec->data.F32[0], 1.15, "f(0): %f", fVec->data.F32[0]);
-        ok_float (fVec->data.F32[1], 1.20, "f(1): %f", fVec->data.F32[1]);
-        ok_float (gVec->data.F32[0], 0.55, "g(0): %f", gVec->data.F32[0]);
+        is_float (fVec->data.F32[0], 1.15, "f(0): %f", fVec->data.F32[0]);
+        is_float (fVec->data.F32[1], 1.20, "f(1): %f", fVec->data.F32[1]);
+        is_float (gVec->data.F32[0], 0.55, "g(0): %f", gVec->data.F32[0]);
 
         // supply the fVec and gVec data to the border
@@ -263,7 +263,7 @@
         psVector *yFit = NULL;
         psSparseBorderSolve (&xFit, &yFit, constraint, border, 4);
-        ok_float_tol (xFit->data.F32[0], 1.0, 1e-4, "f(0): %f", xFit->data.F32[0]);
-        ok_float_tol (xFit->data.F32[1], 1.0, 1e-4, "f(1): %f", xFit->data.F32[1]);
-        ok_float_tol (yFit->data.F32[0], 0.5, 1e-4, "g(0): %f", yFit->data.F32[0]);
+        is_float_tol (xFit->data.F32[0], 1.0, 1e-4, "f(0): %f", xFit->data.F32[0]);
+        is_float_tol (xFit->data.F32[1], 1.0, 1e-4, "f(1): %f", xFit->data.F32[1]);
+        is_float_tol (yFit->data.F32[0], 0.5, 1e-4, "g(0): %f", yFit->data.F32[0]);
 
         psFree (xFit);
@@ -321,5 +321,5 @@
             }
         }
-        ok_float(border->Bij->data.F32[0][0], 0.1, "set matrix element %d,%d", 0, 0);
+        is_float(border->Bij->data.F32[0][0], 0.1, "set matrix element %d,%d", 0, 0);
 
         // construct the Q component:
@@ -381,10 +381,10 @@
         dS /= Nrows;
         dS2 = sqrt (dS2/Nrows - dS*dS);
-        ok_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
+        is_float_tol (dS2, 0.0, 1e-4, "scatter: %.20f", dS2);
 
         // measure stdev between yFit and yRef
         float dY = yRef->data.F32[0] - yFit->data.F32[0];
         // fprintf (stderr, "%5.3f %5.3f %5.3f %5.3f\n", gVec->data.F32[0], yRef->data.F32[0], yFit->data.F32[0], dS);
-        ok_float_tol (dY, 0.0, 2e-4, "scatter: %.20f", dY);
+        is_float_tol (dY, 0.0, 2e-4, "scatter: %.20f", dY);
 
         psFree (xRef);
Index: trunk/psLib/test/math/tap_psStats00.c
===================================================================
--- trunk/psLib/test/math/tap_psStats00.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psStats00.c	(revision 12607)
@@ -9,6 +9,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-03-05 23:23:38 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-03-27 22:52:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -120,5 +120,5 @@
         ok(result, "psVectorStats suceeded (F32: no mask vector, no error vector)");
         ok(!isnan(myStats->sampleMean), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4,
+        is_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4,
                      "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -131,5 +131,5 @@
         ok(result, "psVectorStats suceeded (F32: no mask vector, with error vector)");
         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);
+        is_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -144,5 +144,5 @@
         ok(result, "psVectorStats suceeded (F32, no mask, no errors, with data range)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanRangeNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -156,5 +156,5 @@
         ok(result, "psVectorStats suceeded (F32, no mask, with errors and data range)");
         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);
+        is_float_tol(myStats->sampleMean, expectedWeightMeanNoMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanNoMaskRangeF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -167,5 +167,5 @@
         ok(result, "psVectorStats suceeded (F32, with mask, no errors)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -177,5 +177,5 @@
         ok(result, "psVectorStats suceeded (F32, with mask and errors)");
         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);
+        is_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -188,5 +188,5 @@
         ok(result, "psVectorStats suceeded (F32, with mask and data range)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanRangeWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanRangeWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -198,5 +198,5 @@
         ok(result, "psVectorStats suceeded (F32, withmask, errors, and data range)");
         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);
+        is_float_tol(myStats->sampleMean, expectedWeightMeanWithMaskRangeF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedWeightMeanWithMaskRangeF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -214,5 +214,5 @@
         ok(result, "psVectorStats suceeded (F32, with mask = 2, no errors)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanWithMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -230,5 +230,5 @@
         ok(result, "psVectorStats suceeded (F32, with mask = 3, no errors)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanNoMaskF32, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
     }
@@ -276,5 +276,5 @@
         ok(result, "psVectorStats suceeded (S8, no mask, no errors)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanNoMaskS8, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskS8);
         psFree(myStats);
         psFree(myVector);
@@ -297,5 +297,5 @@
         ok(result, "psVectorStats suceeded (U16, no mask, no errors)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanNoMaskU16, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskU16);
         psFree(myStats);
         psFree(myVector);
@@ -317,5 +317,5 @@
         ok(result, "psVectorStats suceeded (F64, no mask, no errors)");
         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);
+        is_float_tol(myStats->sampleMean, expectedMeanNoMaskF64, 1e-4, "The mean was %f, should be %f", myStats->sampleMean, expectedMeanNoMaskF64);
         psFree(myStats);
         psFree(myVector);
Index: trunk/psLib/test/math/tap_psStats01.c
===================================================================
--- trunk/psLib/test/math/tap_psStats01.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psStats01.c	(revision 12607)
@@ -8,6 +8,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-30 04:41:51 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date $Date: 2007-03-27 22:52:03 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -63,5 +63,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->max, expectedMaxNoMaskF32, 1e-4,
+        is_float_tol(myStats->max, expectedMaxNoMaskF32, 1e-4,
                      "The max was %f, should be %f", myStats->max, expectedMaxNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -74,5 +74,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->max, expectedMaxWithMaskF32, 1e-4,
+        is_float_tol(myStats->max, expectedMaxWithMaskF32, 1e-4,
                      "The max was %f, should be %f", myStats->max, expectedMaxWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -88,5 +88,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->max, expectedMaxRangeNoMaskF32, 1e-4,
+        is_float_tol(myStats->max, expectedMaxRangeNoMaskF32, 1e-4,
                      "The max was %f, should be %f", myStats->max, expectedMaxRangeNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -101,5 +101,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->max, expectedMaxRangeWithMaskF32, 1e-4,
+        is_float_tol(myStats->max, expectedMaxRangeWithMaskF32, 1e-4,
                      "The max was %f, should be %f", myStats->max, expectedMaxRangeWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -136,5 +136,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->max, expectedMaxNoMaskS8, 1e-4,
+        is_float_tol(myStats->max, expectedMaxNoMaskS8, 1e-4,
                      "The max was %f, should be %f", myStats->max, expectedMaxNoMaskS8);
         psFree(myStats);
@@ -157,5 +157,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->max, expectedMaxNoMaskU16, 1e-4,
+        is_float_tol(myStats->max, expectedMaxNoMaskU16, 1e-4,
                      "The max was %f, should be %f", myStats->max, expectedMaxNoMaskU16);
         psFree(myStats);
@@ -178,5 +178,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->max), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->max, expectedMaxNoMaskF64, 1e-4,
+        is_float_tol(myStats->max, expectedMaxNoMaskF64, 1e-4,
                      "The max was %f, should be %f", myStats->max, expectedMaxNoMaskF64);
         psFree(myStats);
Index: trunk/psLib/test/math/tap_psStats02.c
===================================================================
--- trunk/psLib/test/math/tap_psStats02.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psStats02.c	(revision 12607)
@@ -11,6 +11,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-30 04:41:51 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date $Date: 2007-03-27 22:52:03 $
 *
 * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -67,5 +67,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->min, expectedMinNoMaskF32, 1e-4,
+        is_float_tol(myStats->min, expectedMinNoMaskF32, 1e-4,
                      "The min was %f, should be %f", myStats->min, expectedMinNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -80,5 +80,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->min, expectedMinWithMaskF32, 1e-4,
+        is_float_tol(myStats->min, expectedMinWithMaskF32, 1e-4,
                      "The min was %f, should be %f", myStats->min, expectedMinWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -94,5 +94,5 @@
         ok(result, "psVectorStats suceeded");
         ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->min, expectedMinRangeNoMaskF32, 1e-4,
+        is_float_tol(myStats->min, expectedMinRangeNoMaskF32, 1e-4,
                      "The min was %f, should be %f", myStats->min, expectedMinRangeNoMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -107,5 +107,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->min, expectedMinRangeWithMaskF32, 1e-4,
+        is_float_tol(myStats->min, expectedMinRangeWithMaskF32, 1e-4,
                      "The min was %f, should be %f", myStats->min, expectedMinRangeWithMaskF32);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -142,5 +142,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->min, expectedMinNoMaskS8, 1e-4,
+        is_float_tol(myStats->min, expectedMinNoMaskS8, 1e-4,
                      "The min was %f, should be %f", myStats->min, expectedMinNoMaskS8);
         psFree(myStats);
@@ -163,5 +163,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->min, expectedMinNoMaskU16, 1e-4,
+        is_float_tol(myStats->min, expectedMinNoMaskU16, 1e-4,
                      "The min was %f, should be %f", myStats->min, expectedMinNoMaskU16);
         psFree(myStats);
@@ -184,5 +184,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->min), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->min, expectedMinNoMaskF64, 1e-4,
+        is_float_tol(myStats->min, expectedMinNoMaskF64, 1e-4,
                      "The min was %f, should be %f", myStats->min, expectedMinNoMaskF64);
         psFree(myStats);
Index: trunk/psLib/test/math/tap_psStats03.c
===================================================================
--- trunk/psLib/test/math/tap_psStats03.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psStats03.c	(revision 12607)
@@ -44,5 +44,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleMedian, realMedianNoMask, 1e-4,
+        is_float_tol(myStats->sampleMedian, realMedianNoMask, 1e-4,
                      "The sample median was %f, should be %f", myStats->sampleMedian, realMedianNoMask);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -55,5 +55,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleMedian), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleMedian, realMedianWithMask, 1e-4,
+        is_float_tol(myStats->sampleMedian, realMedianWithMask, 1e-4,
                      "The sample median was %f, should be %f", myStats->sampleMedian, realMedianWithMask);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
Index: trunk/psLib/test/math/tap_psStats06.c
===================================================================
--- trunk/psLib/test/math/tap_psStats06.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psStats06.c	(revision 12607)
@@ -45,5 +45,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleStdev, realStdevNoMask, 1e-4,
+        is_float_tol(myStats->sampleStdev, realStdevNoMask, 1e-4,
                      "The mean was %f, should be %f", myStats->sampleStdev, realStdevNoMask);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -56,5 +56,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleStdev), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleStdev, realStdevWithMask, 1e-4,
+        is_float_tol(myStats->sampleStdev, realStdevWithMask, 1e-4,
                      "The mean was %f, should be %f", myStats->sampleStdev, realStdevWithMask);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
Index: trunk/psLib/test/math/tap_psStats08.c
===================================================================
--- trunk/psLib/test/math/tap_psStats08.c	(revision 12513)
+++ trunk/psLib/test/math/tap_psStats08.c	(revision 12607)
@@ -45,5 +45,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleLQ, realLQNoMask, 1e-4,
+        is_float_tol(myStats->sampleLQ, realLQNoMask, 1e-4,
                      "The sampleLQ was %f, should be %f", myStats->sampleLQ, realLQNoMask);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -56,5 +56,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4,
+        is_float_tol(myStats->sampleUQ, realUQNoMask, 1e-4,
                      "The sampleUQ was %f, should be %f", myStats->sampleUQ, realUQNoMask);
         ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks");
@@ -67,5 +67,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleLQ), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleLQ, realLQWithMask, 1e-4,
+        is_float_tol(myStats->sampleLQ, realLQWithMask, 1e-4,
                      "The sampleLQ was %f, should be %f", myStats->sampleLQ,
                      realLQWithMask);
@@ -79,5 +79,5 @@
         ok(result, "psVectorStats succeeded");
         ok(!isnan(myStats->sampleUQ), "psVectorStats() returned non-NAN");
-        ok_float_tol(myStats->sampleUQ, realUQWithMask, 1e-4,
+        is_float_tol(myStats->sampleUQ, realUQWithMask, 1e-4,
                      "The sampleUQ was %f, should be %f", myStats->sampleUQ,
                      realUQWithMask);