Changeset 1800

Timestamp:

Sep 13, 2004, 12:19:51 PM (22 years ago)

Author:

gusciora

Message:

Ensure that coords are passed correctly to the user function.

File:

• trunk/psLib/test/dataManip/tst_psMinimize05.c (modified) (5 diffs)

trunk/psLib/test/dataManip/tst_psMinimize05.c

@@ -6 +6 @@
 #include "psTest.h"
 #include <math.h>
-#define N 2
+#define N 5
 #define MIN_VALUE 20.0
 #define NUM_PARAMS 10
 float expectedParm[NUM_PARAMS];
+int testStatus = true;
 
 /*****************************************************************************
@@ -16 +17 @@
 adds MIN_VALUE to it.  The minimum for this function will be MIN_VALUE, and
 will occur when each parameter equals the associated value in expectedParm[].
+ 
+This procedure ignores the coordinates, other than to ensure that they were
+passed correctly from psMinimizePowell().
  *****************************************************************************/
 float myFunc(psVector *myParams,
@@ -21 +25 @@
 {
     float sum = 0.0;
+    float coordData = 0.0;
+    float expData = 0.0;
     int i;
+
+    for (i=0;i<N;i++) {
+        coordData = ((psVector *) (myCoords->data[i]))->data.F32[0];
+        expData = (float) (i+10);
+        if (fabs(coordData - expData) > FLT_EPSILON) {
+            printf("ERROR(1): coordinate data was incorrectly passed to myFunc()\n");
+            printf("ERROR(1): was (%f) should be (%f)\n", coordData, expData);
+            testStatus = false;
+        }
+        coordData = ((psVector *) (myCoords->data[i]))->data.F32[1];
+        expData = (float) (i+3);
+        if (fabs(coordData - expData) > FLT_EPSILON) {
+            printf("ERROR(2): coordinate data was incorrectly passed to myFunc()\n");
+            printf("ERROR(2): was (%f) should be (%f)\n", coordData, expData);
+            testStatus = false;
+        }
+    }
+
 
     sum = 0.0;
@@ -36 +60 @@
 {
     int currentId = psMemGetId();
-    int testStatus = true;
     int memLeaks = 0;
     int i = 0;
@@ -54 +77 @@
     for (i=0;i<N;i++) {
         myCoords->data[i] = (psPTR *) psVectorAlloc(2, PS_TYPE_F32);
-        ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) i;
-        ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) i;
+        ((psVector *) (myCoords->data[i]))->data.F32[0] = (float) (i+10);
+        ((psVector *) (myCoords->data[i]))->data.F32[1] = (float) (i+3);
     }
     for (i=0;i<NUM_PARAMS;i++) {