Index: /trunk/psLib/src/math/math.i
===================================================================
--- /trunk/psLib/src/math/math.i	(revision 4970)
+++ /trunk/psLib/src/math/math.i	(revision 4971)
@@ -6,5 +6,6 @@
 %include "psMatrix.h"
 %include "psMinimize.h"
-%include "psFunctions.h"
+%include "psPolynomial.h"
+%include "psSpline.h"
 %include "psRandom.h"
 %include "psStats.h"
Index: /trunk/psLib/src/math/psPolynomial.c
===================================================================
--- /trunk/psLib/src/math/psPolynomial.c	(revision 4970)
+++ /trunk/psLib/src/math/psPolynomial.c	(revision 4971)
@@ -1,3 +1,3 @@
-/** @file  psFunctions.c
+/** @file  psPolynomial.c
 *
 *  @brief Contains basic function allocation, deallocation, and evaluation
@@ -7,6 +7,6 @@
 *  polynomials.  It also contains a Gaussian functions.
 *
-*  @version $Revision: 1.118 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-08 00:07:59 $
+*  @version $Revision: 1.119 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-08 00:14:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -206,10 +206,10 @@
     psF64 xSum = 1.0;
 
-    psTrace(".psLib.dataManip.psFunctions.ordPolynomial1DEval", 4,
+    psTrace(".psLib.dataManip.psPolynomial.ordPolynomial1DEval", 4,
             "---- Calling ordPolynomial1DEval(%lf)\n", x);
-    psTrace(".psLib.dataManip.psFunctions.ordPolynomial1DEval", 4,
+    psTrace(".psLib.dataManip.psPolynomial.ordPolynomial1DEval", 4,
             "Polynomial order is %d\n", poly->n);
     for (loop_x = 0; loop_x < poly->n; loop_x++) {
-        psTrace(".psLib.dataManip.psFunctions.ordPolynomial1DEval", 4,
+        psTrace(".psLib.dataManip.psPolynomial.ordPolynomial1DEval", 4,
                 "Polynomial coeff[%d] is %lf\n", loop_x, poly->coeff[loop_x]);
     }
@@ -217,5 +217,5 @@
     for (loop_x = 0; loop_x < poly->n; loop_x++) {
         if (poly->mask[loop_x] == 0) {
-            psTrace(".psLib.dataManip.psFunctions.ordPolynomial1DEval", 10,
+            psTrace(".psLib.dataManip.psPolynomial.ordPolynomial1DEval", 10,
                     "polysum+= sum*coeff [%lf+= (%lf * %lf)\n", polySum, xSum, poly->coeff[loop_x]);
             polySum += xSum * poly->coeff[loop_x];
@@ -546,5 +546,5 @@
     psF32 tmp = 1.0;
 
-    psTrace(".psLib.dataManip.psFunctions.psGaussian", 4,
+    psTrace(".psLib.dataManip.psPolynomial.psGaussian", 4,
             "---- psGaussian() begin ----\n");
 
@@ -553,5 +553,5 @@
     }
 
-    psTrace(".psLib.dataManip.psFunctions.psGaussian", 4,
+    psTrace(".psLib.dataManip.psPolynomial.psGaussian", 4,
             "---- psGaussian() end ----\n");
     return(tmp * exp(-((x - mean) * (x - mean)) / (2.0 * sigma * sigma)));
@@ -759,5 +759,5 @@
     } else {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
+                PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,
                 poly->type);
     }
@@ -792,5 +792,5 @@
     } else {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
+                PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,
                 poly->type);
     }
@@ -839,5 +839,5 @@
     } else {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
+                PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,
                 poly->type);
     }
@@ -895,5 +895,5 @@
     } else {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                PS_ERRORTEXT_psFunctions_INVALID_POLYNOMIAL_TYPE,
+                PS_ERRORTEXT_psPolynomial_INVALID_POLYNOMIAL_TYPE,
                 poly->type);
     }
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);
Index: /trunk/psLib/src/psErrorText_en.dat
===================================================================
--- /trunk/psLib/src/psErrorText_en.dat	(revision 4970)
+++ /trunk/psLib/src/psErrorText_en.dat	(revision 4971)
@@ -203,7 +203,10 @@
 psStats_STATS_POLY_MEDIAN_OUT_OF_RANGE The requested y-value does not fall with the specified range of x-values.  Returning NAN.
 #
-psFunctions_INVALID_POLYNOMIAL_TYPE    Unknown polynomial type 0x%x found.  Evaluation failed.
-psFunctions_TYPE_NOT_SUPPORTED         Input psVector type, %s, is not supported.
-psFunctions_NOT_ENOUGH_DATAPOINTS      Given vector does not have enough data points for %d-order interpolation.
+psPolynomial_INVALID_POLYNOMIAL_TYPE    Unknown polynomial type 0x%x found.  Evaluation failed.
+psPolynomial_TYPE_NOT_SUPPORTED         Input psVector type, %s, is not supported.
+psPolynomial_NOT_ENOUGH_DATAPOINTS      Given vector does not have enough data points for %d-order interpolation.
+psSpline_INVALID_POLYNOMIAL_TYPE    Unknown polynomial type 0x%x found.  Evaluation failed.
+psSpline_TYPE_NOT_SUPPORTED         Input psVector type, %s, is not supported.
+psSpline_NOT_ENOUGH_DATAPOINTS      Given vector does not have enough data points for %d-order interpolation.
 #
 psRandom_UNKNOWN_RANDFOM_NUMBER_GENERATOR_TYPE Unknown Random Number Generator Type
Index: /trunk/psLib/src/pslib_strict.h
===================================================================
--- /trunk/psLib/src/pslib_strict.h	(revision 4970)
+++ /trunk/psLib/src/pslib_strict.h	(revision 4971)
@@ -9,6 +9,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-16 21:17:15 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-08 00:15:15 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72,5 +72,6 @@
 #include "psMinimize.h"
 #include "psRandom.h"
-#include "psFunctions.h"
+#include "psPolynomial.h"
+#include "psSpline.h"
 #include "psStats.h"
 #include "psUnaryOp.h"
Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c	(revision 4970)
+++ /trunk/psLib/src/sys/psMemory.c	(revision 4971)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-08-31 02:07:11 $
+*  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-08 00:17:26 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37,5 +37,4 @@
 //#include "psScalar.h"
 //#include "psVector.h"
-//#include "psFunctions.h"
 //#include "psTime.h"
 //#include "psCoord.h"