Index: trunk/psLib/test/math/tap_psStats00.c
===================================================================
--- trunk/psLib/test/math/tap_psStats00.c	(revision 12242)
+++ 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);