Index: trunk/psLib/src/math/psMinimizePowell.c
===================================================================
--- trunk/psLib/src/math/psMinimizePowell.c	(revision 7766)
+++ trunk/psLib/src/math/psMinimizePowell.c	(revision 8245)
@@ -11,6 +11,6 @@
  *  NOTE: XXX: The SDR is silent about data types.  F32 is implemented here.
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-30 02:20:06 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:26:44 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -117,11 +117,11 @@
     psBool boolLineIsNull = true;
 
-    psTrace(__func__, 4, "---- p_psDetermineBracket() begin ----\n");
+    psTrace("psLib.math", 4, "---- p_psDetermineBracket() begin ----\n");
 
     // If the line vector is zero, then return NULL.
     PS_VECTOR_WITH_MASK_F32_CHECK_ZERO_VECTOR(params, paramMask, boolLineIsNull);
     if (boolLineIsNull == true) {
-        psTrace(__func__, 2, "p_psDetermineBracket() called with zero line vector.\n");
-        psTrace(__func__, 4, "---- p_psDetermineBracket() end (NULL) ----\n");
+        psTrace("psLib.math", 2, "p_psDetermineBracket() called with zero line vector.\n");
+        psTrace("psLib.math", 4, "---- p_psDetermineBracket() end (NULL) ----\n");
         psFree(bracket);
         return(NULL);
@@ -155,8 +155,8 @@
     }
 
-    psTrace(__func__, 6, "(a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", a, b, c, fa, fb, fc);
+    psTrace("psLib.math", 6, "(a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", a, b, c, fa, fb, fc);
 
     while (iter > 0) {
-        psTrace(__func__, 6, "psDetermineBracket(): iteration %d\n", iter);
+        psTrace("psLib.math", 6, "psDetermineBracket(): iteration %d\n", iter);
         if ((fb < fa) && (fb < fc)) {
             bracket->data.F32[0] = a;
@@ -164,5 +164,5 @@
             bracket->data.F32[2] = c;
             psFree(tmp);
-            psTrace(__func__, 6, "---- p_psDetermineBracket() end ----\n");
+            psTrace("psLib.math", 6, "---- p_psDetermineBracket() end ----\n");
             return(bracket);
         }
@@ -177,5 +177,5 @@
         fc = func(tmp, coords);
 
-        psTrace(__func__, 6, "Iter(%d): (a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", iter, a, b, c, fa, fb, fc);
+        psTrace("psLib.math", 6, "Iter(%d): (a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", iter, a, b, c, fa, fb, fc);
 
         if (fa < fb) {
@@ -195,5 +195,5 @@
             bracket->data.F32[2] = c;
             psFree(tmp);
-            psTrace(__func__, 4, "---- p_psDetermineBracket() end ----\n");
+            psTrace("psLib.math", 4, "---- p_psDetermineBracket() end ----\n");
             return(bracket);
         }
@@ -204,5 +204,5 @@
             bracket->data.F32[2] = c;
             psFree(tmp);
-            psTrace(__func__, 4, "---- p_psDetermineBracket() end ----\n");
+            psTrace("psLib.math", 4, "---- p_psDetermineBracket() end ----\n");
             return(bracket);
         }
@@ -213,5 +213,5 @@
     psFree(tmp);
     psFree(bracket);
-    psTrace(__func__, 4, "---- p_psDetermineBracket() end (NULL) ----\n");
+    psTrace("psLib.math", 4, "---- p_psDetermineBracket() end (NULL) ----\n");
     return(NULL);
 }
@@ -228,6 +228,6 @@
     bracket->data.F32[2] = a; \
 } \
-psTrace(__func__, 4, "Final bracket (a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", a, b, c, fa, fb, fc); \
-psTrace(__func__, 4, "---- p_psDetermineBracket() end ----\n"); \
+psTrace("psLib.math", 4, "Final bracket (a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", a, b, c, fa, fb, fc); \
+psTrace("psLib.math", 4, "---- p_psDetermineBracket() end ----\n"); \
 psFree(tmp); \
 return(bracket); \
@@ -253,11 +253,11 @@
     psS32 countMin = 0;
 
-    psTrace(__func__, 4, "---- p_psDetermineBracket() begin ----\n");
+    psTrace("psLib.math", 4, "---- p_psDetermineBracket() begin ----\n");
 
     // If the line vector is zero, then return NULL.
     PS_VECTOR_WITH_MASK_F32_CHECK_ZERO_VECTOR(params, paramMask, boolLineIsNull);
     if (boolLineIsNull == true) {
-        psTrace(__func__, 2, "p_psDetermineBracket() called with zero line vector.\n");
-        psTrace(__func__, 4, "---- p_psDetermineBracket() end (NULL) ----\n");
+        psTrace("psLib.math", 2, "p_psDetermineBracket() called with zero line vector.\n");
+        psTrace("psLib.math", 4, "---- p_psDetermineBracket() end (NULL) ----\n");
         psFree(tmp);
         return(NULL);
@@ -289,5 +289,5 @@
     iter = 0;
     while (iter < PS_DETERMINE_BRACKET_MAX_ITERATIONS) {
-        psTrace(__func__, 6, "psDetermineBracket(): iterationA %d\n", iter);
+        psTrace("psLib.math", 6, "psDetermineBracket(): iterationA %d\n", iter);
         c+= (1.0 + PS_DETERMINE_BRACKET_STEP_SIZE) * (c - a);
 
@@ -295,5 +295,5 @@
         fc = func(tmp, coords);
 
-        psTrace(__func__, 6, "Iteration(%d) (bracket): (a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", iter, a, b, c, fa, fb, fc);
+        psTrace("psLib.math", 6, "Iteration(%d) (bracket): (a, b, c) is (%f %f %f) (fa, fb, fc) is (%f %f %f)\n", iter, a, b, c, fa, fb, fc);
 
         if ((fb < fa) && (fb < fc)) {
@@ -320,5 +320,5 @@
 
     psFree(bracket);
-    psTrace(__func__, 4, "---- p_psDetermineBracket() end (NULL) (BAD) ----\n");
+    psTrace("psLib.math", 4, "---- p_psDetermineBracket() end (NULL) (BAD) ----\n");
     return(NULL);
 }
@@ -371,10 +371,10 @@
     psS32 numIterations = 0;
 
-    psTrace(__func__, 4, "---- LineMin() begin ----\n");
+    psTrace("psLib.math", 4, "---- LineMin() begin ----\n");
     PS_VECTOR_F32_CHECK_ZERO_VECTOR(line, boolLineIsNull);
 
     if (boolLineIsNull == true) {
         min->value = func(params, coords);
-        psTrace(__func__, 2, "LineMin() called with zero line vector.  Return 0.0.  Function value is %f\n", min->value);
+        psTrace("psLib.math", 2, "LineMin() called with zero line vector.  Return 0.0.  Function value is %f\n", min->value);
         return(0.0);
     }
@@ -382,5 +382,5 @@
     if (6 <= psTraceGetLevel(__func__)) {
         for (i=0;i<params->n;i++) {
-            psTrace(__func__, 6, "(params, paramMask, line)[%d] is (%f %d %f)\n", i,
+            psTrace("psLib.math", 6, "(params, paramMask, line)[%d] is (%f %d %f)\n", i,
                     params->data.F32[i], paramMask->data.U8[i], line->data.F32[i]);
         }
@@ -402,5 +402,5 @@
     while (numIterations < PS_LINEMIN_MAX_ITERATIONS) {
         numIterations++;
-        psTrace(__func__, 6, "LineMin(): iteration %d\n", numIterations);
+        psTrace("psLib.math", 6, "LineMin(): iteration %d\n", numIterations);
 
         a = bracket->data.F32[0];
@@ -413,5 +413,5 @@
         fb = func(tmpb, coords);
         fc = func(tmpc, coords);
-        psTrace(__func__, 6, "LineMin: f(%f %f %f) is (%f %f %f)\n", a, b, c, fa, fb, fc);
+        psTrace("psLib.math", 6, "LineMin: f(%f %f %f) is (%f %f %f)\n", a, b, c, fa, fb, fc);
 
         // We determine which is the biggest segment in [a,b,c] then split
@@ -449,5 +449,5 @@
             }
         }
-        psTrace(__func__, 6, "LineMin: new bracket is (%f %f %f)\n", bracket->data.F32[0], bracket->data.F32[1], bracket->data.F32[2]);
+        psTrace("psLib.math", 6, "LineMin: new bracket is (%f %f %f)\n", bracket->data.F32[0], bracket->data.F32[1], bracket->data.F32[2]);
 
         mul = bracket->data.F32[1];
@@ -456,5 +456,5 @@
             min->value = func(params, coords);
             psFree(bracket);
-            psTrace(__func__, 4, "---- LineMin() end.a (%f) (%f) ----\n", mul, min->value);
+            psTrace("psLib.math", 4, "---- LineMin() end.a (%f) (%f) ----\n", mul, min->value);
             psFree(tmpa);
             psFree(tmpb);
@@ -468,5 +468,5 @@
     PS_VECTOR_ADD_MULTIPLE(params, paramMask, line, params, mul);
     min->value = func(params, coords);
-    psTrace(__func__, 4, "---- LineMin() end.b (%f) %f ----\n", mul, min->value);
+    psTrace("psLib.math", 4, "---- LineMin() end.b (%f) %f ----\n", mul, min->value);
 
     psFree(bracket);
@@ -517,7 +517,7 @@
     psS32 iterationNumber = 0;
 
-    psTrace(__func__, 4, "---- psMinimizePowell() begin ----\n");
-    psTrace(__func__, 6, "min->maxIter is %d\n", min->maxIter);
-    psTrace(__func__, 6, "min->tol is %f\n", min->tol);
+    psTrace("psLib.math", 4, "---- psMinimizePowell() begin ----\n");
+    psTrace("psLib.math", 6, "min->maxIter is %d\n", min->maxIter);
+    psTrace("psLib.math", 6, "min->tol is %f\n", min->tol);
 
     if (paramMask == NULL) {
@@ -562,5 +562,5 @@
     while (iterationNumber < min->maxIter) {
         iterationNumber++;
-        psTrace(__func__, 6, "psMinimizePowell() iteration %d\n", iterationNumber);
+        psTrace("psLib.math", 6, "psMinimizePowell() iteration %d\n", iterationNumber);
 
         // 3: For each dimension in params, move Q only in the vector v[i] to
@@ -569,5 +569,5 @@
         baseFuncVal = func(Q, coords);
         currFuncVal = baseFuncVal;
-        psTrace(__func__, 6, "Current function value is %f\n", currFuncVal);
+        psTrace("psLib.math", 6, "Current function value is %f\n", currFuncVal);
 
         biggestDiff = 0;
@@ -588,5 +588,5 @@
                     return(false);
                 }
-                psTrace(__func__, 6, "LineMin along dimension %d has multiple %f\n", i, mul);
+                psTrace("psLib.math", 6, "LineMin along dimension %d has multiple %f\n", i, mul);
 
                 if (fabs(dummyMin.value - currFuncVal) > biggestDiff) {
@@ -598,5 +598,5 @@
             // XXX: how can it be that we are not saving mul anywhere?
         }
-        psTrace(__func__, 6, "New function value is %f\n", currFuncVal);
+        psTrace("psLib.math", 6, "New function value is %f\n", currFuncVal);
         // XXX: There must be a bug here.  How can currFuncVal be the current function value?
         // It is simply the minimum along one of the parameter dimensions.
@@ -608,5 +608,5 @@
                 u->n++;
 
-                psTrace(__func__, 6, "u[i]=Q[i]-P[i] (%f = %f - %f)\n", u->data.F32[i],
+                psTrace("psLib.math", 6, "u[i]=Q[i]-P[i] (%f = %f - %f)\n", u->data.F32[i],
                         Q->data.F32[i],
                         params->data.F32[i]);
@@ -620,5 +620,5 @@
         // 5: Move Q only in the direction u, and minimize the function.
         for (i=0;i<numDims;i++) {
-            psTrace(__func__, 6, "u[i] is %f\n", u->data.F32[i]);
+            psTrace("psLib.math", 6, "u[i] is %f\n", u->data.F32[i]);
         }
 
@@ -643,5 +643,5 @@
             min->value = currFuncVal;
             min->lastDelta = 0.0;
-            psTrace(__func__, 4, "---- psMinimizePowell() end (1)(true) ----\n");
+            psTrace("psLib.math", 4, "---- psMinimizePowell() end (1)(true) ----\n");
             return(true);
         }
@@ -685,5 +685,5 @@
             min->iter = iterationNumber;
             min->lastDelta = currFuncVal - baseFuncVal;
-            psTrace(__func__, 4, "---- psMinimizePowell() end (2) (true) ----\n");
+            psTrace("psLib.math", 4, "---- psMinimizePowell() end (2) (true) ----\n");
             return(true);
         }
@@ -695,5 +695,5 @@
     psFree(Q);
     min->iter = iterationNumber;
-    psTrace(__func__, 4, "---- psMinimizePowell() end (0) (false) ----\n");
+    psTrace("psLib.math", 4, "---- psMinimizePowell() end (0) (false) ----\n");
     return(false);
 }
@@ -712,5 +712,5 @@
     const psArray *coords)
 {
-    psTrace(__func__, 4, "---- myPowellChi2Func() begin ----\n");
+    psTrace("psLib.math", 4, "---- myPowellChi2Func() begin ----\n");
     PS_ASSERT_VECTOR_NON_NULL(params, NAN);
     PS_ASSERT_VECTOR_NON_EMPTY(params, NAN);
@@ -750,5 +750,5 @@
     }
     psFree(tmp);
-    psTrace(__func__, 4, "---- myPowellChi2Func() end (chi2 is %f) ----\n", chi2);
+    psTrace("psLib.math", 4, "---- myPowellChi2Func() end (chi2 is %f) ----\n", chi2);
     return(chi2);
 }