Changeset 35798 for trunk/psLib/src/math/psMinimizeLMM.c

Timestamp:

Jul 11, 2013, 8:00:59 AM (13 years ago)

Author:

watersc1

Message:

Fix to psMM that avoids memory corruption when Ncensored = 0.

File:

• trunk/psLib/src/math/psMinimizeLMM.c (modified) (3 diffs)

trunk/psLib/src/math/psMinimizeLMM.c

@@ -501 +501 @@
         psTrace("psLib.math", 5, "Iteration number %d.  (max iterations is %d).\n", min->iter, min->maxIter);
         psTrace("psLib.math", 5, "Last delta is %f.  stop if < %f, accept if < %f\n", min->lastDelta, min->minTol, min->maxTol);
+        psTrace("psLib.math.dLinear", 5, "Iteration number %d.  (max iterations is %d).\n", min->iter, min->maxIter);
+        psTrace("psLib.math.dLinear", 5, "Last delta is %f.  stop if < %f, accept if < %f\n", min->lastDelta, min->minTol, min->maxTol);
 
         // set a new guess for Alpha, Beta, Params
@@ -519 +521 @@
             p_psVectorPrint(psTraceGetDestination(), Params, "params guess (1)");
         }
+        if (psTraceGetLevel("psLib.math.dLinear") >= 6) {
+          p_psImagePrint(psTraceGetDestination(), Alpha, "alpha guess (1)");
+          p_psVectorPrint(psTraceGetDestination(), Beta, "beta guess (1)");
+          p_psVectorPrint(psTraceGetDestination(), Params, "params guess (1)");
+          p_psVectorPrint(psTraceGetDestination(), params, "params guess (1)");
+        }         
 
         // calculate Chisq for new guess, update Alpha & Beta
@@ -538 +546 @@
 
         psTrace("psLib.math.dLinear", 5, "last chisq: %f, new chisq %f, delta: %f, dLinear: %f, rho: %f, lambda: %g\n", min->value, Chisq, min->lastDelta, dLinear, rho, lambda);
-
+        if (psTraceGetLevel("psLib.math.dLinear") >= 6) {
+          p_psImagePrint(psTraceGetDestination(), Alpha, "alpha guess (2)");
+          p_psVectorPrint(psTraceGetDestination(), Beta, "beta guess (2)");
+          p_psVectorPrint(psTraceGetDestination(), Params, "params guess (2)");
+        }         
         // dump some useful info if trace is defined
         if (psTraceGetLevel("psLib.math") >= 6) {