Changeset 1103 for trunk/psLib/test/dataManip/tst_psMinimize00.c

Timestamp:

Jun 25, 2004, 2:24:30 PM (22 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psLib/test/dataManip/tst_psMinimize00.c (modified) (6 diffs)

trunk/psLib/test/dataManip/tst_psMinimize00.c

@@ -15 +15 @@
 #define NUM_PARAMS 4
 
-float *myFunc(psVector *myData,
-              psVector *myParams)
+float myFunc(const psVector *restrict myData,
+             const psVector *restrict myParams)
 {
     float x = myData->data.F32[0];
@@ -24 +24 @@
     float C = myParams->data.F32[2];
     float D = myParams->data.F32[3];
-    float *tmp = (float *) psAlloc(sizeof(float));
 
-    *tmp = A + (B*x) + (C*y) + (D*x*y);
-    return(tmp);
+    return(A + (B*x) + (C*y) + (D*x*y));
 }
 
-float *myFuncDeriv(psVector *myData,
-                   psVector *myParams,
-                   int whichParamDeriv)
+float myFuncDeriv(const psVector *restrict myData,
+                  const psVector *restrict myParams,
+                  int whichParamDeriv)
 {
     float x = myData->data.F32[0];
     float y = myData->data.F32[1];
-    float *tmp = (float *) psAlloc(sizeof(float));
+    float tmp = 0.0;
 
     if (whichParamDeriv == 0) {
-        *tmp = 1.0;
+        tmp = 1.0;
     } else if (whichParamDeriv == 1) {
-        *tmp = x;
+        tmp = x;
     } else if (whichParamDeriv == 2) {
-        *tmp = y;
+        tmp = y;
     } else if (whichParamDeriv == 3) {
-        *tmp = x * y;
+        tmp = x * y;
     }
     return(tmp);
@@ -66 +64 @@
     int memLeaks = 0;
 
-    domain = psImageAlloc(NUM_DATA, DATA_WIDTH, PS_TYPE_F32);
+    domain = psImageAlloc(DATA_WIDTH, NUM_DATA, PS_TYPE_F32);
     data = psVectorAlloc(NUM_DATA, PS_TYPE_F32);
     errors = psVectorAlloc(NUM_DATA, PS_TYPE_F32);
@@ -73 +71 @@
     tmpVecPtr = psVectorAlloc(DATA_WIDTH, PS_TYPE_F32);
 
+    printf("FUCK: initialGuess->n is %d\n", initialGuess->n);
     // Build the data.
     initialGuess->data.F32[0] = 2.0;
@@ -91 +90 @@
             tmpVecPtr->data.F32[i] = domain->data.F32[i][j];
         }
-        data->data.F32[i] = *myFunc(tmpVecPtr, initialGuess);
+        data->data.F32[i] = myFunc(tmpVecPtr, initialGuess);
     }
 
@@ -104 +103 @@
                    errors,
                    initialGuess,
-                   paramMask,
+                   NULL,
                    &chiSq);