Changeset 2246 for trunk/psLib/src/math/psMinimize.c

Timestamp:

Nov 1, 2004, 8:55:38 AM (22 years ago)

Author:

gusciora

Message:

Working on bracket code.

File:

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

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-29 21:37:09 $
+ *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-01 18:55:38 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
 /* DEFINE STATEMENTS                                                         */
 /*****************************************************************************/
-
+#define PS_SEG psLib
+#define PS_PWD dataManip
+#define PS_FILE psMinimize
 /*****************************************************************************/
 /* TYPE DEFINITIONS                                                          */
@@ -1209 +1211 @@
     int countMin = 0;
 
+    psTrace(".PS_SEG.PS_PWD.PS_FILE.__func__", 6,
+            "---- __func__() begin COOL");
+
+    psTrace(".psLib.dataManip.__func__", 4,
+            "---- p_psDetermineBracket() COOL ----\n");
+
     psTrace(".psLib.dataManip.p_psDetermineBracket", 4,
             "---- p_psDetermineBracket() begin ----\n");
@@ -1222 +1230 @@
     }
 
-    psVector *bracket = psVectorAlloc(3, PS_TYPE_F32);
+    static psVector *bracket = psVectorAlloc(3, PS_TYPE_F32);
     tmp = psVectorAlloc(params->n, PS_TYPE_F32);
-
-
-    a = -1.0;
+    a = -0.5;
     b = 0.0;
-    c = 1.0;
+    c = 0.5;
 
     PS_VECTOR_ADD_MULTIPLE(params, paramMask, line, tmp, b);
@@ -1260 +1266 @@
     // 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;