Changeset 3547 for trunk/psLib/src/dataManip/psMinimize.c

Timestamp:

Mar 29, 2005, 12:34:59 PM (21 years ago)

Author:

gusciora

Message:

Fixes bugs 338. Deeals with robust stats, and min->lastDelta.

File:

• trunk/psLib/src/dataManip/psMinimize.c (modified) (5 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.108 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-29 19:41:56 $
+ *  @version $Revision: 1.109 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-29 22:34:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -786 +786 @@
         //
         if (currChi2 > newChi2) {
-            min->lastDelta = currChi2 - newChi2;
+            min->lastDelta = (currChi2 - newChi2)/currChi2;
             min->value = newChi2;
 
@@ -1406 +1406 @@
 with an initial guess at the parameters of that function and vector "line"
 of the same size as the parameter vector.  It will minimize the function
-along that vector anr returns the offset along that vector at which the
+along that vector and returns the offset along that vector at which the
 minimum is determined.
  
@@ -1713 +1713 @@
             psFree(v);
             min->iter = iterationNumber;
+            // XXX: Ensure that currFuncVal is the correct value to use here.
+            min->value = currFuncVal;
             psTrace(".psLib.dataManip.psMinimizePowell", 4,
                     "---- psMinimizePowell() end (1)(true) ----\n");
@@ -1749 +1751 @@
         if (fabs(baseFuncVal - currFuncVal) <= min->tol) {
             psFree(v);
+            // XXX: Ensure that currFuncVal is the correct value to use here.
+            min->value = currFuncVal;
             min->iter = iterationNumber;
             psTrace(".psLib.dataManip.psMinimizePowell", 4,