Changeset 23416

Timestamp:

Mar 18, 2009, 4:54:42 PM (17 years ago)

Author:

eugene

Message:

do not error on nan values in vector; just skip them

File:

• trunk/psLib/src/math/psStats.c (modified) (1 diff)

trunk/psLib/src/math/psStats.c

@@ -265 +265 @@
     for (long i = 0; i < num; i++) {
         // Check if the data is with the specified range
-        if (maskData && (maskData[i] & maskVal)) {
+        if (!isfinite(vector[i])) 
+            continue;
+        if (useRange && (vector[i] < stats->min))
             continue;
-        }
-
-        if (useRange) {
-            if (vector[i] < stats->min || vector[i] > stats->max) {
-                continue;
-            }
-        } else if (!isfinite(vector[i])) {
-            stats->max = stats->min = NAN;
-            psError(PS_ERR_IEEE, true, "Element %ld of vector is Inf/NaN", i);
-            return 0;
-        }
+        if (useRange && (vector[i] > stats->max))
+            continue;
+        if (maskData && (maskData[i] & maskVal))
+            continue;
 
         numValid++;