Changeset 2246

Timestamp:

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

Author:

gusciora

Message:

Working on bracket code.

Location:

trunk/psLib

Files:

• src/Makefile.Globals (modified) (2 diffs)
• src/dataManip/psMinimize.c (modified) (5 diffs)
• src/math/psMinimize.c (modified) (5 diffs)
• test/dataManip/tst_psMinimize07.c (modified) (3 diffs)

trunk/psLib/src/Makefile.Globals

@@ -5 +5 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.20 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-10-15 19:10:50 $
+##  $Revision: 1.21 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-11-01 18:55:38 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -54 +54 @@
 # Set initial value for CFLAGS which will include all OS common flags for GCC
 GCOVFLAGS :=
-CFLAGS := -O0 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -pipe $(GCOVFLAGS)
+CFLAGS := -O0 -g2 -std=c99 -D_GNU_SOURCE -pipe $(GCOVFLAGS)
 
 ifdef NO_TRACE

trunk/psLib/src/dataManip/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;

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;

trunk/psLib/test/dataManip/tst_psMinimize07.c

@@ -10 +10 @@
 #define N 24
 #define NUM_PARAMS 2
-#define MEAN 10.0
+#define MEAN 8.5
 #define STDEV 1.5
 
@@ -57 +57 @@
 
     psTraceSetLevel(".psLib.dataManip.psMinimize", 6);
+    psTraceSetLevel(".psLib.dataManip.p_psDetermineBracket", 0);
     /**************************************************************************
      *************************************************************************/
@@ -163 +164 @@
 }
 
+#define PS_SEG "psLib."
+#define PS_PWD "dataManip."
+#define PS_FILE "psMinimize."
+#define PS_FUNC "__func__"
+#define TC(a, b, c, d) a ## b ## c ## d
+
+int t02()
+{
+    #define MY_FUNC "t02()"
+    psTraceSetLevel(".", 10);
+
+    //    printf("HMMM: %s\n", PS_SEG PS_PWD PS_FILE MY_FUNC);
+    psTraceSetLevel(PS_SEG PS_PWD PS_FILE MY_FUNC, 5);
+    psTracePrintLevels();
+
+    return(0);
+    #undef MY_FUNC
+}
+
 psS32 main()
 {
     //    t00();
-    t01();
+    //    t01();
+    t02();
 }
+//This code is
+