Changeset 10274

Timestamp:

Nov 29, 2006, 7:55:25 AM (20 years ago)

Author:

rhl

Message:

1/ vectorFittedStats and vectorRobustStats don't own mask and shouldn't free it
2/ Made vectorRobustStats propagate errors in vectorFittedStats
3/ psVectorStats doesn't own stats and shouldn't free it.

File:

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

trunk/psLib/src/math/psStats.c

@@ -16 +16 @@
  * use ->min and ->max (PS_STAT_USE_RANGE)
  *
- *  @version $Revision: 1.190 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-11-23 05:33:28 $
+ *  @version $Revision: 1.191 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-11-29 17:55:25 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1103 +1103 @@
         psError(PS_ERR_UNKNOWN, false, "Failed to calculate the min/max of the input vector.\n");
         psFree(statsMinMax);
-        psFree(mask);
         psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
         return false;
@@ -1157 +1156 @@
         psFree(statsMinMax);
         psFree(histogram);
-        psFree(mask);
         psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
         return false;
@@ -1195 +1193 @@
         psError(PS_ERR_UNKNOWN, false, "Failed to fit a gaussian to the robust histogram.\n");
         psFree(statsMinMax);
+        psFree(histogram);
         psFree(x);
         psFree(y);
         psFree(minimizer);
         psFree(params);
-        psFree(mask);
         psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
         return false;
@@ -1294 +1292 @@
             psError(PS_ERR_UNKNOWN, false, "Failed to calculate the min/max of the input vector.\n");
             psFree(statsMinMax);
-            psFree(mask);
             psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
             return false;
@@ -1312 +1309 @@
             stats->robustN50 = numValid;
             psFree(statsMinMax);
-            psFree(mask);
 
             psTrace("psLib.math", 4, "---- %s(0) end  ----\n", __func__);
@@ -1371 +1367 @@
                 psFree(histogram);
                 psFree(cumulative);
-                psFree(mask);
                 psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
                 return false;
@@ -1388 +1383 @@
             psFree(histogram);
             psFree(cumulative);
-            psFree(mask);
             psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
             return false;
@@ -1424 +1418 @@
             psFree(histogram);
             psFree(cumulative);
-            psFree(mask);
             psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
             return false;
@@ -1543 +1536 @@
         psFree(statsMinMax);
         psFree(cumulative);
-        psFree(mask);
         psTrace("psLib.math", 4, "---- %s(false) end  ----\n", __func__);
         return false;
@@ -1561 +1553 @@
                 "could not determine the robustUQ: fitQuadraticSearchForYThenReturnX() returned a NAN.\n");
         psFree(statsMinMax);
-        psFree(mask);
         psTrace("psLib.math", 4, "---- %s(1) end  ----\n", __func__);
         return false;
@@ -1584 +1575 @@
         stats->fittedStdev = stats->robustStdev;  // pass the guess sigma
         stats->fittedMean = stats->robustMedian;  // pass the guess mean
-        vectorFittedStats (myVector, errors, mask, maskVal, stats);
+        if (!vectorFittedStats(myVector, errors, mask, maskVal, stats)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to estimate statistics (pass 1)");
+            psFree(statsMinMax);
+            psFree(mask);
+
+            return false;
+        }
         // if there is a large swing in sigma, try a second time
         if ((stats->fittedStdev/stats->robustStdev) < 0.75) {
-            vectorFittedStats (myVector, errors, mask, maskVal, stats);
+            if (!vectorFittedStats (myVector, errors, mask, maskVal, stats)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to estimate statistics (pass 2)");
+                psFree(statsMinMax);
+                psFree(mask);
+
+                return false;
+            }
         }
     }
@@ -1966 +1969 @@
     The stats structure.
  
-XXX: Should we free stats if the asserts fail?
+XXX: Should we free stats if the asserts fail? NO; we don't own it (RHL).
  *****************************************************************************/
 psStats* psVectorStats(
@@ -2052 +2055 @@
         if (!vectorRobustStats(inF32, errorsF32, maskU8, maskVal, stats)) {
             psError(PS_ERR_UNKNOWN, false, _("Failed to calculate the specified statistic."));
-            psFree(stats);
             psFree(inF32);
             psFree(errorsF32);