Index: trunk/psLib/src/math/psSpline.h
===================================================================
--- trunk/psLib/src/math/psSpline.h	(revision 5066)
+++ trunk/psLib/src/math/psSpline.h	(revision 5155)
@@ -10,6 +10,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-19 19:53:13 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-27 23:16:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,4 @@
     psVector *knots;                   ///< The boundaries between each spline piece.  Size is n+1.
     psF32 *p_psDeriv2;                 ///< For cubic splines, the second derivative at each domain point.  Size is n+1.
-    psF32 *p_psDomains;                ///< The boundaries between each spline piece.  Size is n+1.
 }
 psSpline1D;
@@ -45,26 +44,9 @@
 /** Allocates a psSpline1D structure
  *
- *  Allocator for psSpline1D where the bounds are implicitly specified through specifying
- *  min and max values along with the number of splines.
+ *  Allocator for psSpline1D.
  *
  *  @return psSpline1D*    new 1-D spline struct
  */
-psSpline1D *psSpline1DAlloc(
-    unsigned int n,                    ///< Number of spline polynomials
-    unsigned int order,                ///< Order of spline polynomials
-    float min,                         ///< Lower boundary value of spline polynomials
-    float max                          ///< Upper boundary value of spline polynomials
-);
-
-/** Allocates a psSpline1D structure
- *
- *  Allocator for psSpline1D where the bounds are explicitly specified.
- *
- *  @return psSpline1D*    new 1-D spline struct
- */
-psSpline1D *psSpline1DAllocGeneric(
-    const psVector *bounds,            ///< Bounds for spline polynomials
-    unsigned int order                 ///< Order of spline polynomials
-);
+psSpline1D *psSpline1DAlloc();
 
 /** Evaluates 1-D spline polynomials at a specific coordinate.
@@ -86,4 +68,26 @@
 );
 
+/** Derive a one-dimensional spline fit.
+ *
+ *  Given a psSpline1D data structure and a set of x,y vectors, this routine
+ *  generates the linear splines which satisfy those data points.
+ *
+ *  @return psSpline1D*:  the calculated one-dimensional splines
+ */
+psSpline1D *psVectorFitSpline1D(
+    const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
+    const psVector* y                  ///< Coordinates
+);
+
+/** Checks the type of a particular pointer.
+ *
+ *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
+ *
+ *  @return bool:       True if the pointer matches a psSpline1D structure, false otherwise.
+ */
+bool psMemCheckSpline1D(
+    psPtr ptr                          ///< the pointer whose type to check
+);
+
 /** Performs a binary disection on a given vector.
  *  Searches through an array of data for a specified value.
@@ -91,5 +95,5 @@
  *  @return psS32    corresponding index number of specified value
  */
-unsigned int p_psVectorBinDisect(
+psS32 p_psVectorBinDisect(
     psVector *bins,                    ///< Array of non-decreasing values
     psScalar *x                        ///< Target value to find
@@ -104,36 +108,6 @@
     psVector *domain,                  ///< Domain (x coords) for interpolation
     psVector *range,                   ///< Range (y coords) for interpolation
-    unsigned int order,                ///< Order of interpolation function
+    psS32 order,                       ///< Order of interpolation function
     psScalar *x                        ///< Location at which to evaluate
-);
-
-/** Checks the type of a particular pointer.
- *
- *  Uses the appropriate deallocation function in psMemBlock to check the ptr datatype.
- *
- *  @return bool:       True if the pointer matches a psSpline1D structure, false otherwise.
- */
-bool psMemCheckSpline1D(
-    psPtr ptr                          ///< the pointer whose type to check
-);
-
-/** Derive a one-dimensional spline fit.
- *
- *  Given a psSpline1D data structure and a set of x,y vectors, this routine
- *  generates the linear splines which satisfy those data points.
- *
- *  @return psSpline1D*:  the calculated one-dimensional splines
- */
-psSpline1D *psVectorFitSpline1D(
-    psSpline1D *spline,                ///< The spline which will be generated.
-    const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
-    const psVector* y,                 ///< Coordinates
-    const psVector* yErr               ///< Errors in coordinates, or NULL
-);
-
-psSpline1D *psVectorFitSpline1DNEW(
-    const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
-    const psVector* y,                 ///< Coordinates
-    unsigned int nKnots                ///< Number of Knots
 );