Changeset 2239

Timestamp:

Oct 29, 2004, 11:37:09 AM (22 years ago)

Author:

gusciora

Message:

Working bracket code.

Location:

trunk/psLib/src

Files:

• dataManip/psMinimize.c (modified) (9 diffs)
• math/psMinimize.c (modified) (9 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-29 21:19:49 $
+ *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-29 21:37:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1206 +1206 @@
     psVector *tmp = NULL;
     psBool boolLineIsNull = true;
+    float prevMin = 0.0;
+    int countMin = 0;
 
     psTrace(".psLib.dataManip.p_psDetermineBracket", 4,
@@ -1224 +1226 @@
 
 
-    determineINitialBracket(params, paramMask, line, coords, func, &a, &b, &fa, &fb);
-
     a = -1.0;
     b = 0.0;
@@ -1244 +1244 @@
         fc = func(tmp, coords);
     } while (fabs(fc - fb) < FLT_EPSILON);
+
+    psTrace(".psLib.dataManip.p_psDetermineBracket", 6,
+            "initial (fa, Fb, Fc) is (%f, %f, %f)\n", fa, fb, fc);
 
     if ((fb < fa) && (fb < fc)) {
@@ -1257 +1260 @@
     // The object of this code is to set the initial point a to 0.0, and
     // ensure that (fb < fa).
-    if (fc < fb) {
+    if (!(fc < fb)) {
         a = b;
         b = c;
@@ -1301 +1304 @@
             fb = fc;
         }
+
+        // This code maintains a count of how many times the minimum fc has
+        // statyed the same.  If it gets too high, we exit this loop.
+        if (fc == prevMin) {
+            countMin++;
+        } else {
+            countMin = 0;
+        }
+        prevMin = fc;
+        if (countMin == 10) {
+            bracket->data.F32[0] = a;
+            bracket->data.F32[1] = b;
+            bracket->data.F32[2] = c;
+            psFree(tmp);
+            psTrace(".psLib.dataManip.p_psDetermineBracket", 6,
+                    "---- p_psDetermineBracket() end ----\n");
+            return(bracket);
+        }
+
         iter++;
     }
@@ -1401 +1423 @@
         psFree(tmpn);
         psError(__func__, "(1) Could not bracket minimum.");
+        return(NAN);
     }
 
@@ -1612 +1635 @@
                 dummyMin.tol = 0.01;
                 mul = p_psLineMin(&dummyMin, Q, v[i], myParamMask, coords, func);
+                if (isnan(mul)) {
+                    psError(__func__, "Could not perform line minimization (1).\n");
+                    psFree(pQP);
+                    psFree(u);
+                    psFree(Q);
+                    if (paramMask == NULL) {
+                        psFree(myParamMask);
+                    }
+                    for (i=0;i<numDims;i++) {
+                        psFree(v[i]);
+                    }
+                    psFree(v);
+                    return(false);
+                }
                 if (fabs(dummyMin.value - currFuncVal) > biggestDiff) {
                     biggestDiff = fabs(dummyMin.value - currFuncVal);
@@ -1643 +1680 @@
 
         mul = p_psLineMin(min, params, u, myParamMask, coords, func);
+        if (isnan(mul)) {
+            psError(__func__, "Could not perform line minimization. (2)\n");
+            psFree(pQP);
+            psFree(u);
+            psFree(Q);
+            if (paramMask == NULL) {
+                psFree(myParamMask);
+            }
+            for (i=0;i<numDims;i++) {
+                psFree(v[i]);
+            }
+            psFree(v);
+            return(false);
+        }
 
         // 6:

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-29 21:19:49 $
+ *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-29 21:37:09 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1206 +1206 @@
     psVector *tmp = NULL;
     psBool boolLineIsNull = true;
+    float prevMin = 0.0;
+    int countMin = 0;
 
     psTrace(".psLib.dataManip.p_psDetermineBracket", 4,
@@ -1224 +1226 @@
 
 
-    determineINitialBracket(params, paramMask, line, coords, func, &a, &b, &fa, &fb);
-
     a = -1.0;
     b = 0.0;
@@ -1244 +1244 @@
         fc = func(tmp, coords);
     } while (fabs(fc - fb) < FLT_EPSILON);
+
+    psTrace(".psLib.dataManip.p_psDetermineBracket", 6,
+            "initial (fa, Fb, Fc) is (%f, %f, %f)\n", fa, fb, fc);
 
     if ((fb < fa) && (fb < fc)) {
@@ -1257 +1260 @@
     // The object of this code is to set the initial point a to 0.0, and
     // ensure that (fb < fa).
-    if (fc < fb) {
+    if (!(fc < fb)) {
         a = b;
         b = c;
@@ -1301 +1304 @@
             fb = fc;
         }
+
+        // This code maintains a count of how many times the minimum fc has
+        // statyed the same.  If it gets too high, we exit this loop.
+        if (fc == prevMin) {
+            countMin++;
+        } else {
+            countMin = 0;
+        }
+        prevMin = fc;
+        if (countMin == 10) {
+            bracket->data.F32[0] = a;
+            bracket->data.F32[1] = b;
+            bracket->data.F32[2] = c;
+            psFree(tmp);
+            psTrace(".psLib.dataManip.p_psDetermineBracket", 6,
+                    "---- p_psDetermineBracket() end ----\n");
+            return(bracket);
+        }
+
         iter++;
     }
@@ -1401 +1423 @@
         psFree(tmpn);
         psError(__func__, "(1) Could not bracket minimum.");
+        return(NAN);
     }
 
@@ -1612 +1635 @@
                 dummyMin.tol = 0.01;
                 mul = p_psLineMin(&dummyMin, Q, v[i], myParamMask, coords, func);
+                if (isnan(mul)) {
+                    psError(__func__, "Could not perform line minimization (1).\n");
+                    psFree(pQP);
+                    psFree(u);
+                    psFree(Q);
+                    if (paramMask == NULL) {
+                        psFree(myParamMask);
+                    }
+                    for (i=0;i<numDims;i++) {
+                        psFree(v[i]);
+                    }
+                    psFree(v);
+                    return(false);
+                }
                 if (fabs(dummyMin.value - currFuncVal) > biggestDiff) {
                     biggestDiff = fabs(dummyMin.value - currFuncVal);
@@ -1643 +1680 @@
 
         mul = p_psLineMin(min, params, u, myParamMask, coords, func);
+        if (isnan(mul)) {
+            psError(__func__, "Could not perform line minimization. (2)\n");
+            psFree(pQP);
+            psFree(u);
+            psFree(Q);
+            if (paramMask == NULL) {
+                psFree(myParamMask);
+            }
+            for (i=0;i<numDims;i++) {
+                psFree(v[i]);
+            }
+            psFree(v);
+            return(false);
+        }
 
         // 6: