Changeset 8245 for trunk/psLib/src/math/psMinimizeLMM.c

Timestamp:

Aug 8, 2006, 4:26:44 PM (20 years ago)

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psLib/src/math/psMinimizeLMM.c (modified) (14 diffs)

trunk/psLib/src/math/psMinimizeLMM.c

@@ -10 +10 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-15 02:57:12 $
+ *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:26:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -71 +71 @@
 
     // LU decomposition version
-    psTrace(__func__, 5, "using LUD version\n");
+    psTrace("psLib.math", 5, "using LUD version\n");
 
     // set new guess values (creates matrix A)
@@ -103 +103 @@
     # else
         // gauss-jordan version
-        psTrace(__func__, 5, "using Gauss-J version");
+        psTrace("psLib.math", 5, "using Gauss-J version");
 
     // set new guess values (creates matrix A)
@@ -158 +158 @@
     psMinimizeLMChi2Func func)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() begin ----\n", __func__);
     // allocate internal arrays (current vs Guess)
     psImage  *alpha  = psImageAlloc (params->n, params->n, PS_TYPE_F64);
@@ -184 +184 @@
         rc = false;
     }
-    psTrace(__func__, 5, "p_psMinLM_SetABX() was succesful\n", __func__);
+    psTrace("psLib.math", 5, "p_psMinLM_SetABX() was succesful\n", __func__);
 
     psBool rcBool = p_psMinLM_GuessABP(Alpha, delta, Params, alpha, beta, params, paramMask, NULL, NULL, NULL, 0.0);
@@ -191 +191 @@
         rc = false;
     }
-    psTrace(__func__, 5, "p_psMinLM_GuessABP() was succesful\n", __func__);
+    psTrace("psLib.math", 5, "p_psMinLM_GuessABP() was succesful\n", __func__);
 
     psFree(alpha);
@@ -200 +200 @@
         psFree(dy);
     }
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() end ----\n", __func__);
     return(rc);
 }
@@ -335 +335 @@
     psMinimizeLMChi2Func func)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(min, false);
     // XXX: If covar not NULL, do asserts...
@@ -415 +415 @@
     }
     if (psTraceGetLevel (__func__) >= 6) {
-        psTrace(__func__, 6, "The current Param vector: \n");
+        psTrace("psLib.math", 6, "The current Param vector: \n");
         for (psS32 i = 0 ; i < Params->n ; i++) {
-            psTrace(__func__, 6, "Params[%d] is %f\n", Params->data.F32[i]);
+            psTrace("psLib.math", 6, "Params[%d] is %f\n", Params->data.F32[i]);
         }
     }
@@ -423 +423 @@
     // iterate until the tolerance is reached, or give up
     while ((min->iter < min->maxIter) && ((min->lastDelta > min->tol) || !isfinite(min->lastDelta))) {
-        psTrace(__func__, 5, "Iteration number %d.  (max iterations is %d).\n", min->iter, min->maxIter);
-        psTrace(__func__, 5, "Last delta is %f.  Min->tol is %f.\n", min->lastDelta, min->tol);
+        psTrace("psLib.math", 5, "Iteration number %d.  (max iterations is %d).\n", min->iter, min->maxIter);
+        psTrace("psLib.math", 5, "Last delta is %f.  Min->tol is %f.\n", min->lastDelta, min->tol);
 
         // set a new guess for Alpha, Beta, Params
@@ -445 +445 @@
         if (psTraceGetLevel(__func__) >= 6) {
             if (psTraceGetLevel (__func__) >= 6) {
-                psTrace(__func__, 6, "The current Param vector: \n");
+                psTrace("psLib.math", 6, "The current Param vector: \n");
                 for (psS32 i = 0 ; i < Params->n ; i++) {
-                    psTrace(__func__, 6, "Params[%d] is %f\n", Params->data.F32[i]);
+                    psTrace("psLib.math", 6, "Params[%d] is %f\n", Params->data.F32[i]);
                 }
             }
@@ -466 +466 @@
         psF64 rho = (min->value - Chisq) / dLinear;
 
-        psTrace(__func__, 5, "last chisq: %f, new chisq %f, delta: %f, rho: %f\n", min->value,
+        psTrace("psLib.math", 5, "last chisq: %f, new chisq %f, delta: %f, rho: %f\n", min->value,
                 Chisq, min->lastDelta, rho);
 
@@ -489 +489 @@
         min->iter++;
     }
-    psTrace(__func__, 5, "chisq: %f, last delta: %f, Niter: %d\n", min->value, min->lastDelta, min->iter);
+    psTrace("psLib.math", 5, "chisq: %f, last delta: %f, Niter: %d\n", min->value, min->lastDelta, min->iter);
 
     // construct & return the covariance matrix (if requested)
@@ -509 +509 @@
     }
     if (min->iter == min->maxIter) {
-        psTrace(__func__, 3, "---- %s(false) end ----\n", __func__);
+        psTrace("psLib.math", 3, "---- %s(false) end ----\n", __func__);
         return(false);
     }
-    psTrace(__func__, 3, "---- %s(true) end ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s(true) end ----\n", __func__);
     return(true);
 }