Changeset 6898 for branches/rel10_ifa/psLib/src/math/psMinimizeLMM.c

Timestamp:

Apr 18, 2006, 8:30:56 PM (20 years ago)

Author:

magnier

Message:

added NaN tests to psMinimizeLMM

File:

• branches/rel10_ifa/psLib/src/math/psMinimizeLMM.c (modified) (6 diffs)

branches/rel10_ifa/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.5.6.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-16 08:01:04 $
+ *  @version $Revision: 1.5.6.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-19 06:30:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 #include <math.h>
 
+#include "psAbort.h"
 #include "psMinimizeLMM.h"
 #include "psImage.h"
@@ -174 +175 @@
     psF64 rcF64 = p_psMinLM_SetABX(alpha, beta, params, paramMask, x, y, dy, func);
     if (isnan(rcF64)) {
-        psError(PS_ERR_UNKNOWN, false, "p_psMinLM_SetABX() retruned a NAN.\n");
+        psError(PS_ERR_UNKNOWN, false, "p_psMinLM_SetABX() returned a NAN.\n");
         rc = false;
     }
@@ -181 +182 @@
     psBool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, NULL, NULL, 0.0);
     if (rcBool == false) {
-        psError(PS_ERR_UNKNOWN, false, "p_psMinLM_GuessABP() retruned FALSE.\n");
+        psError(PS_ERR_UNKNOWN, false, "p_psMinLM_GuessABP() returned FALSE.\n");
         rc = false;
     }
@@ -255 +256 @@
         delta = ymodel - y->data.F32[i];
         chisq += PS_SQR(delta) * dy->data.F32[i];
+        if (isnan(dy->data.F32[i]))
+            psAbort ("psMinLMM", "nan in weights");
+        if (isnan(delta))
+            psAbort ("psMinLMM", "nan in delta");
+        if (isnan(chisq))
+            psAbort ("psMinLMM", "nan in chisq");
 
         for (psS32 j = 0; j < params->n; j++) {
@@ -432 +439 @@
         // calculate Chisq for new guess, update Alpha & Beta
         Chisq = p_psMinLM_SetABX(Alpha, Beta, Params, paramMask, x, y, dy, func);
+        if (isnan(Chisq)) {
+            min->iter ++;
+            lambda *= 10.0;
+            continue;
+        }
 
         // XXX EAM alternate convergence criterion: