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

Timestamp:

Jun 5, 2007, 11:13:14 AM (19 years ago)

Author:

Paul Price

Message:

Don't produce an error if an Inf/NaN value is masked --- it should be quietly ignored.

File:

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

trunk/psLib/src/math/psStats.c

@@ -13 +13 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.211 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-05-24 02:06:51 $
+ *  @version $Revision: 1.212 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-06-05 21:13:14 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -259 +259 @@
     for (long i = 0; i < num; i++) {
         // Check if the data is with the specified range
-        if (!isfinite(vector[i])) {
+        if (maskData && (maskData[i] & maskVal)) {
+            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);
@@ -265 +273 @@
         }
 
-        if (useRange && (vector[i] < stats->min))
-            continue;
-        if (useRange && (vector[i] > stats->max))
-            continue;
-        if (maskData && (maskData[i] & maskVal))
-            continue;
         numValid++;
         max = PS_MAX (vector[i], max);