Changeset 6332

Timestamp:

Feb 6, 2006, 12:27:20 PM (20 years ago)

Author:

desonia

Message:

reduced the precision of printing of float values to mitigate machine
differences between types of processors.

-rdd

Location:

trunk/psLib/test/math

Files:

• tst_psMinimizeLMM.c (modified) (1 diff)
• tst_psMinimizePowell.c (modified) (2 diffs)
• verified/tst_psMinimizeLMM.stdout (modified) (1 diff)
• verified/tst_psMinimizePowell.stdout (modified) (2 diffs)

trunk/psLib/test/math/tst_psMinimizeLMM.c

@@ -89 +89 @@
 
         for (psS32 i=0;i<NUM_PARAMS;i++) {
-            printf("Parameter %d at the minimum is %f (expected: %f)\n", i,
+            printf("Parameter %d at the minimum is %.1f (expected: %.1f)\n", i,
                    myParams->data.F32[i], expectedParm[i]);
             fflush(stdout);

trunk/psLib/test/math/tst_psMinimizePowell.c

@@ -108 +108 @@
 
     for (i=0;i<NUM_PARAMS;i++) {
-        printf("Parameter %d at the minimum is %f (expected: %f)\n", i,
+        printf("Parameter %d at the minimum is %.1f (expected: %.1f)\n", i,
                myParams->data.F32[i], expectedParm[i]);
 
@@ -181 +181 @@
 
     for (i=0;i<NUM_PARAMS;i++) {
-        printf("Parameter %d at the minimum is %f (expected: %f)\n", i,
+        printf("Parameter %d at the minimum is %.1f (expected: %.1f)\n", i,
                myParams->data.F32[i], expectedParm[i]);
 

trunk/psLib/test/math/verified/tst_psMinimizeLMM.stdout

@@ -21 +21 @@
 The minimum for data point number 18: f is 18.00
 The minimum for data point number 19: f is 19.00
-Parameter 0 at the minimum is -3.391722 (expected: 2.420000)
-Parameter 1 at the minimum is -14.965391 (expected: 4.420000)
-Parameter 2 at the minimum is 2.076689 (expected: 6.420000)
-Parameter 3 at the minimum is 10.633801 (expected: 8.420000)
-Parameter 4 at the minimum is 1.315034 (expected: 10.420000)
+Parameter 0 at the minimum is -3.4 (expected: 2.4)
+Parameter 1 at the minimum is -15.0 (expected: 4.4)
+Parameter 2 at the minimum is 2.1 (expected: 6.4)
+Parameter 3 at the minimum is 10.6 (expected: 8.4)
+Parameter 4 at the minimum is 1.3 (expected: 10.4)
 The LMM minimization tests PASSED.
 DONE

trunk/psLib/test/math/verified/tst_psMinimizePowell.stdout

@@ -7 +7 @@
 
 The minimum is 20.000000 (expected: 20.000000)
-Parameter 0 at the minimum is 2.307660 (expected: 2.320000)
+Parameter 0 at the minimum is 2.3 (expected: 2.3)
 Parameter 0: (2.3), expected was (2.3)
-Parameter 1 at the minimum is 4.310108 (expected: 4.320000)
+Parameter 1 at the minimum is 4.3 (expected: 4.3)
 Parameter 1: (4.3), expected was (4.3)
-Parameter 2 at the minimum is 6.305460 (expected: 6.320000)
+Parameter 2 at the minimum is 6.3 (expected: 6.3)
 Parameter 2: (6.3), expected was (6.3)
-Parameter 3 at the minimum is 8.309398 (expected: 8.320000)
+Parameter 3 at the minimum is 8.3 (expected: 8.3)
 Parameter 3: (8.3), expected was (8.3)
-Parameter 4 at the minimum is 10.311120 (expected: 10.320000)
+Parameter 4 at the minimum is 10.3 (expected: 10.3)
 Parameter 4: (10.3), expected was (10.3)
-Parameter 5 at the minimum is 12.309612 (expected: 12.320000)
+Parameter 5 at the minimum is 12.3 (expected: 12.3)
 Parameter 5: (12.3), expected was (12.3)
-Parameter 6 at the minimum is 14.320016 (expected: 14.320000)
+Parameter 6 at the minimum is 14.3 (expected: 14.3)
 Parameter 6: (14.3), expected was (14.3)
-Parameter 7 at the minimum is 16.318933 (expected: 16.320000)
+Parameter 7 at the minimum is 16.3 (expected: 16.3)
 Parameter 7: (16.3), expected was (16.3)
-Parameter 8 at the minimum is 18.323397 (expected: 18.320000)
+Parameter 8 at the minimum is 18.3 (expected: 18.3)
 Parameter 8: (18.3), expected was (18.3)
-Parameter 9 at the minimum is 20.314043 (expected: 20.320000)
+Parameter 9 at the minimum is 20.3 (expected: 20.3)
 Parameter 9: (20.3), expected was (20.3)
 
@@ -38 +38 @@
 
 The minimum is 20.000000 (expected: 20.000000)
-Parameter 0 at the minimum is 2.307660 (expected: 2.320000)
+Parameter 0 at the minimum is 2.3 (expected: 2.3)
 Parameter 0: (2.3), expected was (2.3)
-Parameter 1 at the minimum is 4.310108 (expected: 4.320000)
+Parameter 1 at the minimum is 4.3 (expected: 4.3)
 Parameter 1: (4.3), expected was (4.3)
-Parameter 2 at the minimum is 6.305460 (expected: 6.320000)
+Parameter 2 at the minimum is 6.3 (expected: 6.3)
 Parameter 2: (6.3), expected was (6.3)
-Parameter 3 at the minimum is 8.309398 (expected: 8.320000)
+Parameter 3 at the minimum is 8.3 (expected: 8.3)
 Parameter 3: (8.3), expected was (8.3)
-Parameter 4 at the minimum is 10.311120 (expected: 10.320000)
+Parameter 4 at the minimum is 10.3 (expected: 10.3)
 Parameter 4: (10.3), expected was (10.3)
-Parameter 5 at the minimum is 12.309612 (expected: 12.320000)
+Parameter 5 at the minimum is 12.3 (expected: 12.3)
 Parameter 5: (12.3), expected was (12.3)
-Parameter 6 at the minimum is 14.320016 (expected: 14.320000)
+Parameter 6 at the minimum is 14.3 (expected: 14.3)
 Parameter 6: (14.3), expected was (14.3)
-Parameter 7 at the minimum is 16.318933 (expected: 16.320000)
+Parameter 7 at the minimum is 16.3 (expected: 16.3)
 Parameter 7: (16.3), expected was (16.3)
-Parameter 8 at the minimum is 18.323397 (expected: 18.320000)
+Parameter 8 at the minimum is 18.3 (expected: 18.3)
 Parameter 8: (18.3), expected was (18.3)
-Parameter 9 at the minimum is 20.314043 (expected: 20.320000)
+Parameter 9 at the minimum is 20.3 (expected: 20.3)
 Parameter 9: (20.3), expected was (20.3)