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

Timestamp:

Sep 10, 2004, 5:03:36 PM (22 years ago)

Author:

gusciora

Message:

...

File:

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

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-10 22:25:59 $
+ *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-11 03:03:36 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1244 +1244 @@
         psTrace(".psLib.dataManip.p_psDetermineBracket", 4,
                 "---- p_psDetermineBracket() end (NULL) ----\n");
+        psFree(bracket);
         return(NULL);
     }
@@ -1293 +1294 @@
 
     psTrace(".psLib.dataManip.p_psDetermineBracket", 6,
-            "HMMM(%d): (%f %f %f) (%f %f %f)\n", iter, a, b, c, fa, fb, fc);
+            "(a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", a, b, c, fa, fb, fc);
+
     while (iter > 0) {
         psTrace(".psLib.dataManip.p_psDetermineBracket", 6,
@@ -1329 +1331 @@
 
         psTrace(".psLib.dataManip.p_psDetermineBracket", 6,
-                "HMMM(%d): (%f %f %f) (%f %f %f)\n", iter, a, b, c, fa, fb, fc);
+                "Iter(%d): (a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", iter, a, b, c, fa, fb, fc);
 
         if (fa < fb) {
@@ -1370 +1372 @@
             "---- p_psDetermineBracket() end (NULL) ----\n");
     return(NULL);
-}
-
-bool p_psDummyFunc(int dimNum,
-                   psVector *params,
-                   const psArray *coords,
-                   psMinimizePowellFunc func)
-{
-    return(true);
 }
 
@@ -1494 +1488 @@
     psTrace(".psLib.dataManip.psLineMin", 4,
             "---- psLineMin() begin ----\n");
-
-    for (i=0;i<params->n;i++) {
-        if (paramMask->data.U8[i] == 0) {
+    psTrace(".psLib.dataManip.psLineMin", 6,
+            "min->maxIter is %d\n", min->maxIter);
+    psTrace(".psLib.dataManip.psLineMin", 6,
+            "min->tol is %f\n", min->tol);
+
+    if (paramMask != NULL) {
+        for (i=0;i<params->n;i++) {
+            if (paramMask->data.U8[i] == 0) {
+                if (line->data.F32[i] >= FLT_EPSILON) {
+                    null = 1;
+                    psTrace(".psLib.dataManip.psLineMin", 4,
+                            "line->data.F32[%d] is %f\n", i, line->data.F32[i]);
+                }
+            }
+        }
+    } else {
+        for (i=0;i<params->n;i++) {
             if (line->data.F32[i] >= FLT_EPSILON) {
                 null = 1;
@@ -1504 +1512 @@
         }
     }
+
     if (null == 0) {
         psTrace(".psLib.dataManip.psLineMin", 2,
@@ -1514 +1523 @@
     tmpc = psVectorAlloc(params->n, PS_TYPE_F32);
     tmpn = psVectorAlloc(params->n, PS_TYPE_F32);
-
 
     for (i=0;i<params->n;i++) {
@@ -1526 +1534 @@
     bracket = p_psDetermineBracket(params, line, paramMask, coords, func);
     if (bracket == NULL) {
+        psFree(tmpa);
+        psFree(tmpb);
+        psFree(tmpc);
+        psFree(tmpn);
         psAbort(__func__, "(1) Could not bracket minimum.");
     }
@@ -1554 +1566 @@
         fc = func(tmpc, coords);
         psTrace(".psLib.dataManip.psLineMin", 6,
-                "Iteration %d: f(%f %f %f) is (%f %f %f)\n", min->iter, a, b, c, fa, fb, fc);
+                "Iteration %d: f(%f %f %f) is (%f %f %f)\n", min->iter,
+                a, b, c, fa, fb, fc);
 
         // We determine which is the biggest segment in [a,b,c] then split
@@ -1608 +1621 @@
             psFree(tmpn);
             psTrace(".psLib.dataManip.psLineMin", 4,
-                    "---- psLineMin() end (%f) ----\n", mul);
+                    "---- psLineMin() end.a (%f) ----\n", mul);
             return(mul);
         }
@@ -1620 +1633 @@
 
     psTrace(".psLib.dataManip.psLineMin", 4,
-            "---- psLineMin() end (0.0) ----\n");
+            "---- psLineMin() end.b (0.0) ----\n");
     return(0.0);
 }
@@ -1663 +1676 @@
     psTrace(".psLib.dataManip.psMinimizePowell", 4,
             "---- psMinimizePowell() begin ----\n");
+    psTrace(".psLib.dataManip.psMinimizePowell", 6,
+            "min->maxIter is %d\n", min->maxIter);
+    psTrace(".psLib.dataManip.psMinimizePowell", 6,
+            "min->tol is %f\n", min->tol);
 
     pQP = psVectorAlloc(numDims, PS_TYPE_F32);
@@ -1704 +1721 @@
         for (i=0;i<numDims;i++) {
             if (paramMask->data.U8[i] == 0) {
+                dummyMin.maxIter = 100;
+                dummyMin.tol = 0.01;
                 mul = psLineMin(&dummyMin, Q, v[i], paramMask, coords, func);
                 if (fabs(dummyMin.value - currFuncVal) > biggestDiff) {