Changeset 1129

Timestamp:

Jun 29, 2004, 1:30:47 PM (22 years ago)

Author:

gusciora

Message:

This version works (with no parameter masks). This version has lots of
print statements. I'm checking it in now in case the next version does
not work, and I want the print statements.

Location:

trunk/psLib/src

Files:

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

trunk/psLib/src/dataManip/psMinimize.c

@@ -82 +82 @@
     int i;
     double Yi;
+
+    for (i=0;i<3;i++) {
+        printf("(expb_f(): gsl_vector_get(x, %d) is %.1f\n", i,
+               gsl_vector_get(x, i));
+    }
+
 
     A      = gsl_vector_get(x, 0);
@@ -210 +216 @@
     tmpVecPtr = psVectorAlloc(domain->numCols, PS_TYPE_F32);
 
+    for (i=0;i<3;i++) {
+        printf("(FART: gsl_vector_get(x, %d) is %.1f\n", i,
+               gsl_vector_get(x, i));
+    }
+
+
+
+
     // The GSL routines will call this function with the masked parameters
     // removed.  However, the user-supplied function (to be modified) does not
@@ -228 +242 @@
     } else {
         for (i=0;i<initialGuess->n;i++) {
-            inputParameterList->data.F32[i] = initialGuess->data.F32[i];
+            inputParameterList->data.F32[i] = gsl_vector_get(x, i);
         }
     }
@@ -298 +312 @@
     } else {
         for (i=0;i<initialGuess->n;i++) {
-            inputParameterList->data.F32[i] = initialGuess->data.F32[i];
+            inputParameterList->data.F32[i] = gsl_vector_get(x, i);
         }
     }

trunk/psLib/src/math/psMinimize.c

@@ -82 +82 @@
     int i;
     double Yi;
+
+    for (i=0;i<3;i++) {
+        printf("(expb_f(): gsl_vector_get(x, %d) is %.1f\n", i,
+               gsl_vector_get(x, i));
+    }
+
 
     A      = gsl_vector_get(x, 0);
@@ -210 +216 @@
     tmpVecPtr = psVectorAlloc(domain->numCols, PS_TYPE_F32);
 
+    for (i=0;i<3;i++) {
+        printf("(FART: gsl_vector_get(x, %d) is %.1f\n", i,
+               gsl_vector_get(x, i));
+    }
+
+
+
+
     // The GSL routines will call this function with the masked parameters
     // removed.  However, the user-supplied function (to be modified) does not
@@ -228 +242 @@
     } else {
         for (i=0;i<initialGuess->n;i++) {
-            inputParameterList->data.F32[i] = initialGuess->data.F32[i];
+            inputParameterList->data.F32[i] = gsl_vector_get(x, i);
         }
     }
@@ -298 +312 @@
     } else {
         for (i=0;i<initialGuess->n;i++) {
-            inputParameterList->data.F32[i] = initialGuess->data.F32[i];
+            inputParameterList->data.F32[i] = gsl_vector_get(x, i);
         }
     }