Index: trunk/psLib/src/math/psSpline.c
===================================================================
--- trunk/psLib/src/math/psSpline.c	(revision 4970)
+++ trunk/psLib/src/math/psSpline.c	(revision 4971)
@@ -1,3 +1,3 @@
-/** @file  psFunctions.c
+/** @file psSpline.c
 *
 *  @brief Contains basic function allocation, deallocation, and evaluation
@@ -7,6 +7,6 @@
 *  splines.
 *
-*  @version $Revision: 1.121 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-08 00:07:59 $
+*  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-08 00:14:32 $
 *
 *
@@ -112,9 +112,9 @@
     p_psMemSetPersistent(p->data.TYPE, true); \
     \
-    psTrace(".psLib.dataManip.psFunctions.fullInterpolate1D##TYPE", 4, \
+    psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 4, \
             "---- fullInterpolate1D##TYPE() begin (%d-order at x=%f) (%d data points)----\n", n-1, x, n); \
     \
     for (i=0;i<n;i++) { \
-        psTrace(".psLib.dataManip.psFunctions.fullInterpolate1D##TYPE", 6, \
+        psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 6, \
                 "domain/range is (%f %f)\n", domain[i], range[i]); \
     } \
@@ -122,5 +122,5 @@
     for (i=0;i<n;i++) { \
         p->data.TYPE[i] = range[i]; \
-        psTrace(".psLib.dataManip.psFunctions.fullInterpolate1D##TYPE", 6, \
+        psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 6, \
                 "p->data.TYPE[%d] is %f\n", i, p->data.TYPE[i]); \
         \
@@ -139,9 +139,9 @@
             /*printf("((%f-%f * %f) + (%f-%f * %f)) / (%f - %f)\n", x, domain[i+m], p->data.TYPE[i], domain[i], x, p->data.TYPE[i+1], domain[i], domain[i+m]); \
              */ \
-            psTrace(".psLib.dataManip.psFunctions.fullInterpolate1D##TYPE", 6, \
+            psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 6, \
                     "p->data.TYPE[%d] is %f\n", i, p->data.TYPE[i]); \
         } \
     } \
-    psTrace(".psLib.dataManip.psFunctions.fullInterpolate1D##TYPE", 4, \
+    psTrace(".psLib.dataManip.psSpline.fullInterpolate1D##TYPE", 4, \
             "---- fullInterpolate1D##TYPE() end ----\n"); \
     \
@@ -181,5 +181,5 @@
     psS32 origin;
 
-    psTrace(".psLib.dataManip.psFunctions.interpolate1DF32", 4,
+    psTrace(".psLib.dataManip.psSpline.interpolate1DF32", 4,
             "---- interpolate1DF32() begin ----\n");
 
@@ -202,5 +202,5 @@
     }
 
-    psTrace(".psLib.dataManip.psFunctions.interpolate1DF32", 4,
+    psTrace(".psLib.dataManip.psSpline.interpolate1DF32", 4,
             "---- interpolate1DF32() end ----\n");
     return(fullInterpolate1DF32(&domain[origin], &range[origin], order+1, x));
@@ -349,5 +349,5 @@
     psS32 mid; \
     \
-    psTrace(".psLib.dataManip.psFunctions.vectorBinDisect##TYPE", 4, \
+    psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
             "---- Calling vectorBinDisect##TYPE(%f)\n", x); \
     \
@@ -371,10 +371,10 @@
     \
     while (min != max) { \
-        psTrace(".psLib.dataManip.psFunctions.vectorBinDisect##TYPE", 4, \
+        psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
                 "(min, mid, max) is (%d, %d, %d): (x, bins) is (%f, %f)\n", \
                 min, mid, max, x, bins[mid]); \
         \
         if (x == bins[mid]) { \
-            psTrace(".psLib.dataManip.psFunctions.vectorBinDisect##TYPE", 4, \
+            psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
                     "---- Exiting vectorBinDisect##TYPE(): bin %d\n", mid); \
             return(mid); \
@@ -387,5 +387,5 @@
     } \
     \
-    psTrace(".psLib.dataManip.psFunctions.vectorBinDisect##TYPE", 4, \
+    psTrace(".psLib.dataManip.psSpline.vectorBinDisect##TYPE", 4, \
             "---- Exiting vectorBinDisect##TYPE(): bin %d\n", min); \
     return(min); \
@@ -441,5 +441,5 @@
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
-                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                PS_ERRORTEXT_psSpline_TYPE_NOT_SUPPORTED,
                 strType);
         return 0;
@@ -447,5 +447,5 @@
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
-                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                PS_ERRORTEXT_psSpline_TYPE_NOT_SUPPORTED,
                 strType);
         return 0;
@@ -453,5 +453,5 @@
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
-                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                PS_ERRORTEXT_psSpline_TYPE_NOT_SUPPORTED,
                 strType);
         return 0;
@@ -487,10 +487,10 @@
     psVector *range32 = NULL;
     psVector *domain32 = NULL;
-    psTrace(".psLib.dataManip.psFunctions.p_psVectorInterpolate", 4,
+    psTrace(".psLib.dataManip.psSpline.p_psVectorInterpolate", 4,
             "---- p_psVectorInterpolate() begin ----\n");
 
     if (order > (domain->n - 1)) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
-                PS_ERRORTEXT_psFunctions_NOT_ENOUGH_DATAPOINTS,
+                PS_ERRORTEXT_psSpline_NOT_ENOUGH_DATAPOINTS,
                 order);
         return(NULL);
@@ -498,5 +498,5 @@
 
     if (x->type.type == PS_TYPE_F32) {
-        psTrace(".psLib.dataManip.psFunctions.p_psVectorInterpolate", 4,
+        psTrace(".psLib.dataManip.psSpline.p_psVectorInterpolate", 4,
                 "---- p_psVectorInterpolate() end ----\n");
         return(psScalarAlloc(interpolate1DF32(domain->data.F32,
@@ -519,5 +519,5 @@
         psFree(domain32);
 
-        psTrace(".psLib.dataManip.psFunctions.p_psVectorInterpolate", 4,
+        psTrace(".psLib.dataManip.psSpline.p_psVectorInterpolate", 4,
                 "---- p_psVectorInterpolate() end ----\n");
         // XXX: Convert data type to F64?
@@ -528,11 +528,11 @@
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
-                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                PS_ERRORTEXT_psSpline_TYPE_NOT_SUPPORTED,
                 strType);
     }
 
-    psTrace(".psLib.dataManip.psFunctions.p_psVectorInterpolate", 4,
+    psTrace(".psLib.dataManip.psSpline.p_psVectorInterpolate", 4,
             "return(NULL)\n");
-    psTrace(".psLib.dataManip.psFunctions.p_psVectorInterpolate", 4,
+    psTrace(".psLib.dataManip.psSpline.p_psVectorInterpolate", 4,
             "---- p_psVectorInterpolate() end ----\n");
 
@@ -622,5 +622,5 @@
         PS_TYPE_NAME(strType,x->type.type);
         psError(PS_ERR_BAD_PARAMETER_TYPE,
-                PS_ERRORTEXT_psFunctions_TYPE_NOT_SUPPORTED,
+                PS_ERRORTEXT_psSpline_TYPE_NOT_SUPPORTED,
                 strType);
         return(NULL);