Changeset 2406 for trunk/psLib/src/math/psStats.c

Timestamp:

Nov 23, 2004, 9:35:30 AM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/src/math/psStats.c (modified) (9 diffs)

trunk/psLib/src/math/psStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-15 21:13:17 $
+ *  @version $Revision: 1.98 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-23 19:35:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -146 +146 @@
 this routine sets stats->sampleMean to NAN.
  *****************************************************************************/
-void p_psVectorSampleMean(const psVector* restrict myVector,
-                          const psVector* restrict maskVector,
-                          psU32 maskVal,
-                          psStats* stats)
+int p_psVectorSampleMean(const psVector* restrict myVector,
+                         const psVector* restrict maskVector,
+                         psU32 maskVal,
+                         psStats* stats)
 {
     psS32 i = 0;                // Loop index variable
@@ -210 +210 @@
 
     stats->sampleMean = mean;
+    if (isnan(mean)) {
+        return(0);
+    } else {
+        return(-1);
+    }
+
 }
 
@@ -217 +223 @@
 this routine sets stats->max to NAN.
  *****************************************************************************/
-void p_psVectorMax(const psVector* restrict myVector,
-                   const psVector* restrict maskVector,
-                   psU32 maskVal,
-                   psStats* stats)
+int p_psVectorMax(const psVector* restrict myVector,
+                  const psVector* restrict maskVector,
+                  psU32 maskVal,
+                  psStats* stats)
 {
     psS32 i = 0;                // Loop index variable
@@ -272 +278 @@
     } else {
         stats->max = NAN;
-    }
+        return(1);
+    }
+    return(0);
 }
 
@@ -280 +288 @@
 this routine sets stats->min to NAN.
  *****************************************************************************/
-void p_psVectorMin(const psVector* restrict myVector,
-                   const psVector* restrict maskVector,
-                   psU32 maskVal,
-                   psStats* stats)
+int p_psVectorMin(const psVector* restrict myVector,
+                  const psVector* restrict maskVector,
+                  psU32 maskVal,
+                  psStats* stats)
 {
     psS32 i = 0;                // Loop index variable
@@ -335 +343 @@
     } else {
         stats->min = NAN;
-    }
+        return(1);
+    }
+    return(0);
 }
 
@@ -1205 +1215 @@
     // Determine minimum and maximum values in the data vector.
     if (isnan(stats->min)) {
-        p_psVectorMin(myVector, maskVector, maskVal, stats);
-    }
+        if (0 != p_psVectorMin(myVector, maskVector, maskVal, stats)) {
+            psLogMsg(__func__, PS_LOG_WARN,
+                     "WARNING: p_psVectorMin(): p_psVectorMin() reported a NAN mean.\n");
+            return(1);
+        }
+    }
+
+
     if (isnan(stats->max)) {
-        p_psVectorMax(myVector, maskVector, maskVal, stats);
+        if (0 != p_psVectorMax(myVector, maskVector, maskVal, stats)) {}
     }
 
@@ -1771 +1787 @@
     // ************************************************************************
     if (stats->options & PS_STAT_MAX) {
-        p_psVectorMax(inF32, mask, maskVal, stats);
+        if (0 != p_psVectorMax(inF32, mask, maskVal, stats)) {
+            psError(PS_ERR_UNKNOWN, false,
+                    "Failed to calculate vector maximum");
+            psFree(stats);
+            return(NULL);
+        }
     }
     // ************************************************************************
     if (stats->options & PS_STAT_MIN) {
-        p_psVectorMin(inF32, mask, maskVal, stats);
+        if (0 != p_psVectorMin(inF32, mask, maskVal, stats)) {
+            psError(PS_ERR_UNKNOWN, false,
+                    "Failed to calculate vector minimum");
+            psFree(stats);
+            return(NULL);
+        }
     }