Changeset 6202

Timestamp:

Jan 26, 2006, 9:07:53 AM (20 years ago)

Author:

gusciora

Message:

Unset trace levels

File:

• trunk/psLib/test/math/tst_psMinimize06.c (modified) (4 diffs)

trunk/psLib/test/math/tst_psMinimize06.c

@@ -29 +29 @@
              psVector *x)
 {
-    if ((deriv == NULL) || (params == NULL)) {
-        psError(PS_ERR_UNKNOWN, true, "deriv or params is NULL.\n");
+    if ((deriv == NULL) || (params == NULL) || (x == NULL)) {
+        psError(PS_ERR_UNKNOWN, true, "deriv or params or x is NULL.\n");
     }
 
@@ -51 +51 @@
 {
     psS32 currentId = psMemGetId();
-    psTraceSetLevel(".psLib", 0);
-    /**************************************************************************
-     *************************************************************************/
+
     psMinimization *min = psMinimizationAlloc(NUM_ITERATIONS, ERR_TOL);
     psImage *myCovar = psImageAlloc(NUM_PARAMS, NUM_PARAMS, PS_TYPE_F32);
@@ -74 +72 @@
     }
 
-    psBool rc = psMinimizeLMChi2(min,
-                                 NULL,
-                                 myParams,
-                                 NULL,
-                                 myCoords,
-                                 y,
-                                 NULL,
+    psBool rc = psMinimizeLMChi2(min, NULL, myParams, NULL, myCoords, y, NULL,
                                  (psMinimizeLMChi2Func) myFunc);
     if (rc == false) {
@@ -89 +81 @@
         printf("\nThe value of the function at the minimum is %f\n", min->value);
         for (psS32 i=0;i<NUM_DATA_POINTS;i++) {
-            printf("The minimum for data point %d: %f\n", i, myFunc(myDerivs, myParams, (psVector *) myCoords->data[i]));
+            printf("The minimum for data point number %d: f is %.2f\n",
+                   i, myFunc(myDerivs, myParams, (psVector *) myCoords->data[i]));
             fflush(stdout);
         }