Index: trunk/psLib/test/math/tst_psStats00.c
===================================================================
--- trunk/psLib/test/math/tst_psStats00.c	(revision 5117)
+++ trunk/psLib/test/math/tst_psStats00.c	(revision 6215)
@@ -6,11 +6,11 @@
 *  do a much simpler test with data types PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_F64.
 *
-*  If the psStats,c code every changes such that vectors of different type
+*  If the psStats,c code ever changes such that vectors of different type
 *  are handled by different routines, then these tests must be extended.
 *
 *  @author GLG, MHPCC
 * 
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-24 01:10:00 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date $Date: 2006-01-26 23:49:11 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -22,5 +22,5 @@
 #define ERROR_TOL  0.0001
 #define N 15
-
+#define VERBOSE 1
 static psS32 testStatsSampleMeanF32(void);
 static psS32 testStatsSampleMeanS8(void);
@@ -71,5 +71,5 @@
     psTraceSetLevel(".", 0);
     psTraceSetLevel("p_psGetStatValue", 0);
-    psTraceSetLevel("p_psVectorSampleMean", 0);
+    psTraceSetLevel("p_psVectorSampleMean", 10);
     psTraceSetLevel("p_psVectorMax", 0);
     psTraceSetLevel("p_psVectorMin", 0);
@@ -119,4 +119,5 @@
     }
 
+    printf("HMMM: myStats->options is (0x%x)\n", myStats->options);
     /*************************************************************************/
     /*  Call psVectorStats() with no vector mask.                    */
@@ -125,5 +126,8 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
-    if ( fabs(mean - expectedMeanNoMaskF32) > ERROR_TOL ) {
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanNoMaskF32);
+    }
+    if (isnan(myStats->sampleMean) || (fabs(mean - expectedMeanNoMaskF32) > ERROR_TOL)) {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",
                 mean, expectedMeanNoMaskF32);
@@ -135,5 +139,8 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
-    if ( fabs(mean - expectedWeightMeanNoMaskF32) > ERROR_TOL ) {
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedWeightMeanNoMaskF32);
+    }
+    if (isnan(myStats->sampleMean) || (fabs(mean - expectedWeightMeanNoMaskF32) > ERROR_TOL)) {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",
                 mean, expectedWeightMeanNoMaskF32);
@@ -148,4 +155,7 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanRangeNoMaskF32);
+    }
     if ( fabs(mean - expectedMeanRangeNoMaskF32) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Return value %f not as expected %f",
@@ -158,4 +168,7 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedWeightMeanNoMaskRangeF32);
+    }
     if ( fabs(mean - expectedWeightMeanNoMaskRangeF32) > ERROR_TOL) {
         psError(PS_ERR_UNKNOWN,true,"Return value %f not as expected %f",
@@ -170,4 +183,7 @@
     myStats = psVectorStats(myStats, myVector, NULL, maskVector, 1);
     mean = myStats->sampleMean;
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanWithMaskF32);
+    }
     if ( fabs(mean - expectedMeanWithMaskF32) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",
@@ -179,4 +195,7 @@
     myStats = psVectorStats(myStats, myVector, myErrors, maskVector, 1);
     mean = myStats->sampleMean;
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedWeightMeanWithMaskF32);
+    }
     if ( fabs(mean - expectedWeightMeanWithMaskF32) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",
@@ -190,4 +209,7 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanRangeWithMaskF32);
+    }
     if ( fabs(mean - expectedMeanRangeWithMaskF32) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Return value %f not as expected %f",
@@ -200,4 +222,7 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedWeightMeanWithMaskRangeF32);
+    }
     if ( fabs(mean - expectedWeightMeanWithMaskRangeF32) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Return value %f not as expected %f",
@@ -219,4 +244,7 @@
     myStats = psVectorStats(myStats, myVector, NULL, maskVector, 2);
     mean = myStats->sampleMean;
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanWithMaskF32);
+    }
     if (fabs(mean - expectedMeanWithMaskF32) > ERROR_TOL )  {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",
@@ -237,4 +265,7 @@
     myStats = psVectorStats(myStats, myVector, NULL, maskVector, 4);
     mean = myStats->sampleMean;
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanNoMaskF32);
+    }
     if (fabs(mean - expectedMeanNoMaskF32) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Return value %f not as expected %f",
@@ -307,4 +338,7 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanNoMaskS8);
+    }
     if ( fabs(mean - expectedMeanNoMaskS8) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",
@@ -347,4 +381,7 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanNoMaskU16);
+    }
     if ( fabs(mean - expectedMeanNoMaskU16) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",
@@ -387,4 +424,7 @@
     mean = myStats->sampleMean;
     // Verify return value is as expected
+    if (VERBOSE) {
+        printf("psVectorStats() returned %.2f: expected was %.2f\n", mean, expectedMeanNoMaskF64);
+    }
     if ( fabs(mean - expectedMeanNoMaskF64) > ERROR_TOL ) {
         psError(PS_ERR_UNKNOWN,true,"Returned value %f not as expected %f",