Changeset 5113 for trunk/psLib/src/math/psMinimize.c

Timestamp:

Sep 23, 2005, 1:01:30 PM (21 years ago)

Author:

gusciora

Message:

The purpose of this check-in is primarily to put the new robusts stats
code and tests into the CVS tree.

File:

• trunk/psLib/src/math/psMinimize.c (modified) (6 diffs)

trunk/psLib/src/math/psMinimize.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.139 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-22 02:47:16 $
+ *  @version $Revision: 1.140 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-23 23:01:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -204 +204 @@
     # ifndef PS_NO_TRACE
     // dump some useful info if trace is defined
-    if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 5) {
-        p_psImagePrint  (psTraceGetDestination(), alpha, "alpha guess");
-        p_psVectorPrint (psTraceGetDestination(), beta, "beta guess");
-        p_psVectorPrint (psTraceGetDestination(), params, "params guess");
-    }
-    if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") == 4) {
-        // XXX: Where is this?
-        // p_psVectorPrintRow (psTraceGetDestination(), Params, "params guess");
-    }
+    /* XXX: This code is seg faulting.
+        if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 5) {
+            p_psImagePrint  (psTraceGetDestination(), alpha, "alpha guess");
+            p_psVectorPrint (psTraceGetDestination(), beta, "beta guess");
+            p_psVectorPrint (psTraceGetDestination(), params, "params guess");
+        }
+        if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 4) {
+            // XXX: Where is this?
+            // p_psVectorPrintRow (psTraceGetDestination(), Params, "params guess");
+        }
+    */
     # endif /* PS_NO_TRACE */
 
@@ -226 +228 @@
         # ifndef PS_NO_TRACE
         // dump some useful info if trace is defined
-        if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 5) {
-            p_psImagePrint  (psTraceGetDestination(), Alpha, "alpha guess");
-            p_psVectorPrint (psTraceGetDestination(), Beta, "beta guess");
-            p_psVectorPrint (psTraceGetDestination(), Params, "params guess");
-        }
-        if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") == 4) {
-            // XXX: Where is this?
-            // p_psVectorPrintRow (psTraceGetDestination(), Params, "params guess");
-        }
+        /* XXX: This code is seg faulting.
+                if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 5) {
+                    p_psImagePrint  (psTraceGetDestination(), Alpha, "alpha guess");
+                    p_psVectorPrint (psTraceGetDestination(), Beta, "beta guess");
+                    p_psVectorPrint (psTraceGetDestination(), Params, "params guess");
+                }
+                if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 4) {
+                    // XXX: Where is this?
+                    // p_psVectorPrintRow (psTraceGetDestination(), Params, "params guess");
+                }
+        */
         # endif /* PS_NO_TRACE */
 
@@ -249 +253 @@
         # ifndef PS_NO_TRACE
         // dump some useful info if trace is defined
-        if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 5) {
-            p_psImagePrint  (psTraceGetDestination(), Alpha, "alpha guess");
-            p_psVectorPrint (psTraceGetDestination(), Beta, "beta guess");
-            p_psVectorPrint (psTraceGetDestination(), Params, "params guess");
-        }
+        /* XXX: This code is seg faulting.
+                if (psTraceGetLevel (".psLib.dataManip.psMinimizeLMChi2") >= 5) {
+                    p_psImagePrint  (psTraceGetDestination(), Alpha, "alpha guess");
+                    p_psVectorPrint (psTraceGetDestination(), Beta, "beta guess");
+                    p_psVectorPrint (psTraceGetDestination(), Params, "params guess");
+                }
+        */
         # endif /* PS_NO_TRACE */
 
@@ -271 +277 @@
         //        printf("CONDITIONS: (%f > %f) && (%d < %d)\n", min->lastDelta, min->tol, min->iter, min->maxIter);
     }
-    psTrace (".psLib.dataManip.psMinimizeLMChi2", 3, "chisq: %f, last delta: %f, Niter: %d\n", min->value, min->lastDelta, min->iter);
+    psTrace (".psLib.dataManip.psMinimizeLMChi2", 4, "chisq: %f, last delta: %f, Niter: %d\n", min->value, min->lastDelta, min->iter);
 
     // construct & return the covariance matrix (if requested)
@@ -1579 +1585 @@
 
     if (psTraceGetLevel (".psLib.dataManip.VectorFitPolynomial1DOrd") >= 5) {
-        FILE *fp = fdopen((psTraceGetDestination ()), "a+");
-        fprintf(fp, "VectorFitPolynomial1D()\n");
+        psTrace(__func__, 6, "VectorFitPolynomial1D()\n");
         for (int i = 0; i < f->n; i++) {
-            fprintf(fp, "(x, f, fErr) is (");
+            psTrace(__func__, 6, "(x, f, fErr) is (");
             if (x != NULL) {
-                fprintf(fp, "%f, %f, ", x->data.F64[i], f->data.F64[i]);
+                psTrace(__func__, 6, "%f, %f, ", x->data.F64[i], f->data.F64[i]);
             } else {
-                fprintf(fp, "%f, %f, ", (psF64) i, f->data.F64[i]);
+                psTrace(__func__, 6, "%f, %f, ", (psF64) i, f->data.F64[i]);
             }
             if (fErr != NULL) {
-                fprintf(fp, "%f)\n", fErr->data.F64[i]);
+                psTrace(__func__, 6, "%f)\n", fErr->data.F64[i]);
             } else {
-                fprintf(fp, "NULL)\n");
-            }
-        }
-        fclose(fp);
+                psTrace(__func__, 6, "NULL)\n");
+            }
+        }
     }