Changeset 41534 for trunk/psModules/src/objects/pmGrowthCurveGenerate.c

Timestamp:

Apr 3, 2021, 2:22:19 PM (5 years ago)

Author:

eugene

Message:

raise a warning, rather that fail with an error, if we cannot generate the curve of growth

File:

• trunk/psModules/src/objects/pmGrowthCurveGenerate.c (modified) (4 diffs)

trunk/psModules/src/objects/pmGrowthCurveGenerate.c

@@ -87 +87 @@
         }
     }
-    psAssert (growths->n, "cannot build growth curve (psf model is invalid everywhere)");
+    // psAssert (growths->n, "cannot build growth curve (psf model is invalid everywhere)");
+    // if we cannot generate a curve-of-growth, warn but do not raise an error or abort
+    if (!growths->n) {
+      psWarning ("cannot build growth curve (psf model is invalid everywhere)");
+      psFree (growths);
+      return false;
+    }
 
     // just use a simple sample median to get the 'best' value from each growth curve...
@@ -102 +108 @@
     }
     if (!psVectorStats (stats, values, NULL, NULL, 0)) {
-        psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+        // if we cannot generate a curve-of-growth, warn but do not raise an error or abort
+        psWarning("failure to measure stats for curve of growth");
+        psFree (growths);
+        psFree (stats);
+        psFree (values);
         return false;
     }
@@ -120 +130 @@
         }
         if (!psVectorStats (stats, values, NULL, NULL, 0)) {
-            psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+            // psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+            psWarning("failure to measure stats for curve of growth");
+            psFree (growths);
+            psFree (stats);
+            psFree (values);
             return false;
         }
@@ -290 +304 @@
         } else {
             if (!psVectorStats (stats, values, NULL, NULL, 0)) {
-                psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                // psError(PS_ERR_UNKNOWN, false, "failure to measure stats");
+                psWarning("failure to measure stats for curve of growth (from sources)");
+                psFree (growths);
+                psFree (stats);
+                psFree (values);
                 return false;
             }