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

Timestamp:

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

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psLib/src/math/psSpline.c (modified) (13 diffs)

trunk/psLib/src/math/psSpline.c

@@ -6 +6 @@
 *  This file contains the routines that allocate, free, and evaluate splines.
 *
-*  @version $Revision: 1.151 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-08-08 23:32:23 $
+*  @version $Revision: 1.152 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-08-09 02:26:44 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -119 +119 @@
     const psVector* y)                  ///< Coordinates
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 4, "---- %s() begin ----\n", __func__);
     if (psTraceGetLevel(__func__) >= 6) {
         p_psVectorPrint(1, (psVector *) x, "x");
@@ -143 +143 @@
         u[i] = ((6.0 * u[i] / (X[i+1] - X[i-1])) - (sig * u[i-1])) / p;
 
-        psTrace(__func__, 6, "X[%d] is %f\n", i, X[i]);
-        psTrace(__func__, 6, "Y[%d] is %f\n", i, Y[i]);
-        psTrace(__func__, 6, "u[%d] is %f\n", i, u[i]);
+        psTrace("psLib.math", 6, "X[%d] is %f\n", i, X[i]);
+        psTrace("psLib.math", 6, "Y[%d] is %f\n", i, Y[i]);
+        psTrace("psLib.math", 6, "u[%d] is %f\n", i, u[i]);
     }
 
@@ -154 +154 @@
     for (psS32 k=(n-2);k>=0;k--) {
         derivs2[k] = derivs2[k] * derivs2[k+1] + u[k];
-        psTrace(__func__, 6, "derivs2[%d] is %f\n", k, derivs2[k]);
+        psTrace("psLib.math", 6, "derivs2[%d] is %f\n", k, derivs2[k]);
     }
     psFree(u);
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psLib.math", 4, "---- %s() end ----\n", __func__);
     return(derivs2);
 }
@@ -210 +210 @@
     const psVector* y)                  ///< Coordinates.
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_VECTOR_NON_NULL(y, NULL);
     PS_ASSERT_VECTOR_TYPE_F32_OR_F64(y, NULL);
     PS_ASSERT_INT_LARGER_THAN_OR_EQUAL(y->n, 2, NULL);
     psS32 numSplines = (y->n)-1;
-    psTrace(__func__, 5, "numSplines is %d\n", numSplines);
+    psTrace("psLib.math", 5, "numSplines is %d\n", numSplines);
 
     //
@@ -281 +281 @@
                     i, i+1, xPtr->data.F32[i], xPtr->data.F32[i+1]);
         }
-        psTrace(__func__, 6, "x data (%f - %f) (%f)\n", xPtr->data.F32[i], xPtr->data.F32[i+1], H);
+        psTrace("psLib.math", 6, "x data (%f - %f) (%f)\n", xPtr->data.F32[i], xPtr->data.F32[i+1], H);
         //
         // ******** Calculate 0-order term ********
@@ -334 +334 @@
         spline->spline[i]->coeff[3]+=  spline->p_psDeriv2[i+1] / (6.0 * H);
 
-        psTrace(__func__, 6, "(spline->spline[%u])->coeff[0] is %f\n", i, spline->spline[i]->coeff[0]);
-        psTrace(__func__, 6, "(spline->spline[%u])->coeff[1] is %f\n", i, spline->spline[i]->coeff[1]);
-        psTrace(__func__, 6, "(spline->spline[%u])->coeff[2] is %f\n", i, spline->spline[i]->coeff[2]);
-        psTrace(__func__, 6, "(spline->spline[%u])->coeff[3] is %f\n", i, spline->spline[i]->coeff[3]);
+        psTrace("psLib.math", 6, "(spline->spline[%u])->coeff[0] is %f\n", i, spline->spline[i]->coeff[0]);
+        psTrace("psLib.math", 6, "(spline->spline[%u])->coeff[1] is %f\n", i, spline->spline[i]->coeff[1]);
+        psTrace("psLib.math", 6, "(spline->spline[%u])->coeff[2] is %f\n", i, spline->spline[i]->coeff[2]);
+        psTrace("psLib.math", 6, "(spline->spline[%u])->coeff[3] is %f\n", i, spline->spline[i]->coeff[3]);
     }
 
@@ -343 +343 @@
         psFree(yPtr);
     }
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() end ----\n", __func__);
     return(spline);
 }
@@ -365 +365 @@
     float x)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(spline, NAN);
     PS_ASSERT_INT_NONNEGATIVE(spline->n, NAN);
@@ -379 +379 @@
 
         psS32 binNum = (x < spline->knots->data.F32[0]) ? 0 : n-1;
-        psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+        psTrace("psLib.math", 3, "---- %s() end ----\n", __func__);
         return(psPolynomial1DEval(spline->spline[binNum], x));
     }
@@ -392 +392 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() end ----\n", __func__);
     return(psPolynomial1DEval(spline->spline[binNum], x));
 }
@@ -403 +403 @@
     const psVector *x)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(spline, NULL);
     PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL);
@@ -426 +426 @@
     }
 
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psLib.math", 3, "---- %s() end ----\n", __func__);
     return(tmpVector);
 }