Changeset 30075

Timestamp:

Dec 16, 2010, 6:10:00 PM (15 years ago)

Author:

eugene

Message:

handle bad data case when (eg) almost all data points are in a single bin (was failing on the edge case of the first bin)

File:

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

trunk/psLib/src/math/psStats.c

@@ -827 +827 @@
         // values; nearly bi-modal distribution).  if so, keep only points within 5? 10?
         // bins of that excess bin:
-        int nMaxBin = 0;
+        int nMaxBin = histogram->nums->data.F32[0];
         int iMaxBin = 0;
         for (long i = 1; i < histogram->nums->n; i++) {
@@ -843 +843 @@
                 if (mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal) continue;
                 bool invalid = false;
-                invalid |= (myVector->data.F32[i] <= minKeep);
-                invalid |= (myVector->data.F32[i] >= maxKeep);
+                invalid |= (myVector->data.F32[i] < minKeep);
+                invalid |= (myVector->data.F32[i] > maxKeep);
                 invalid |= (!isfinite(myVector->data.F32[i]));
                 if (!invalid) continue;
@@ -852 +852 @@
 
             if (nInvalid) {
-              psTrace(TRACE, 6, "data is concentrated in a single bin, masking %d extreme outliers and retrying\n", nInvalid);
+              psTrace(TRACE, 6, "data is concentrated in a single bin (%d = %f - %f), masking %d extreme outliers and retrying\n", 
+                      iMaxBin, histogram->bounds->data.F32[iMaxBin], histogram->bounds->data.F32[iMaxBin+1], nInvalid);
               psFree(histogram);
               psFree(cumulative);
@@ -1108 +1109 @@
     // 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;
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN;
+        stats->results |= PS_STAT_FITTED_STDEV;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN;
+        stats->results |= PS_STAT_FITTED_STDEV;
         return true;
     }
@@ -1289 +1300 @@
     // 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;
-        psTrace(TRACE, 4, "---- %s() end ----\n", __func__);
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN_V2;
+        stats->results |= PS_STAT_FITTED_STDEV_V2;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN_V2;
+        stats->results |= PS_STAT_FITTED_STDEV_V2;
         return true;
     }
@@ -1486 +1506 @@
     // 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;
-        psTrace(TRACE, 4, "---- %s() end ----\n", __func__);
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN_V3;
+        stats->results |= PS_STAT_FITTED_STDEV_V3;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN_V3;
+        stats->results |= PS_STAT_FITTED_STDEV_V3;
         return true;
     }
@@ -1782 +1811 @@
 
     // If the mean is NAN, then generate a warning and set the stdev to NAN.
-    if (isnan(stats->robustMedian)) goto escape;
+    if (isnan(stats->robustMedian)) {
+        stats->fittedMean = NAN;
+        stats->fittedStdev = NAN;
+        stats->results |= PS_STAT_FITTED_MEAN_V4;
+        stats->results |= PS_STAT_FITTED_STDEV_V4;
+        return true;
+    }
+
+    if (stats->robustStdev <= FLT_EPSILON) {
+        stats->fittedMean = stats->robustMedian;
+        stats->fittedStdev = stats->robustStdev;
+        stats->results |= PS_STAT_FITTED_MEAN_V4;
+        stats->results |= PS_STAT_FITTED_STDEV_V4;
+        return true;
+    }
 
     float guessStdev = stats->robustStdev;  // pass the guess sigma