Changeset 24884

Timestamp:

Jul 21, 2009, 2:52:17 PM (17 years ago)

Author:

eugene

Message:

add test for zero-range vector in fitted stats v4; clean up exit for function

File:

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

trunk/psLib/src/math/psStats.c

@@ -1734 +1734 @@
 
     // If the mean is NAN, then generate a warning and set the stdev to NAN.
-    if (isnan(stats->robustMedian)) {
-        stats->fittedStdev = NAN;
-        stats->fittedStdev = NAN;
-        return true;
-    }
+    if (isnan(stats->robustMedian)) goto escape;
 
     float guessStdev = stats->robustStdev;  // pass the guess sigma
@@ -1770 +1766 @@
             COUNT_WARNING(10, 100, "Failed to calculate the min/max of the input vector.\n");
             psFree(statsMinMax);
-            stats->fittedStdev = NAN;
-            stats->fittedStdev = NAN;
+            goto escape;
+        }
+
+        // If all data points have the same value, then we set the appropriate members of stats and return.
+        if (fabs(max - min) <= FLT_EPSILON) {
+            COUNT_WARNING(10, 100, "All data points have the same value: %f.\n", min);
+            stats->fittedMean = min;
+            stats->fittedStdev = 0.0;
+            stats->results |= PS_STAT_FITTED_MEAN_V4;
+            stats->results |= PS_STAT_FITTED_STDEV_V4;
             return true;
         }
@@ -1789 +1793 @@
             psFree(histogram);
             psFree(statsMinMax);
-            stats->fittedStdev = NAN;
-            stats->fittedStdev = NAN;
-            return true;
+            goto escape;
         }
         if (psTraceGetLevel("psLib.math") >= 8) {
@@ -1823 +1825 @@
             COUNT_WARNING(10, 100, "Failed to calculate the min/max of the input vector.\n");
             psFree(statsMinMax);
-            stats->fittedStdev = NAN;
-            stats->fittedStdev = NAN;
-            return true;
+            goto escape;
         }
 
@@ -1898 +1898 @@
                 psFree(histogram);
                 psFree(statsMinMax);
-                stats->fittedStdev = NAN;
-                stats->fittedStdev = NAN;
-                return true;
+                goto escape;
             }
 
@@ -1919 +1917 @@
 
                 COUNT_WARNING(10, 100, "fit did not converge\n");
-                stats->fittedStdev = NAN;
-                stats->fittedStdev = NAN;
-                return true;
+                goto escape;
             }
 
@@ -1991 +1987 @@
                 psFree(histogram);
                 psFree(statsMinMax);
-                stats->fittedStdev = NAN;
-                stats->fittedStdev = NAN;
-                return true;
+                goto escape;
             }
 
@@ -2038 +2032 @@
     psTrace(TRACE, 6, "The fitted stdev is %f.\n", stats->fittedStdev);
 
+    stats->results |= PS_STAT_FITTED_MEAN_V4;
+    stats->results |= PS_STAT_FITTED_STDEV_V4;
+
+    return true;
+
+escape:
+    stats->fittedMean = NAN;
+    stats->fittedStdev = NAN;
     stats->results |= PS_STAT_FITTED_MEAN_V4;
     stats->results |= PS_STAT_FITTED_STDEV_V4;