Index: trunk/psLib/src/dataManip/psMinimize.h
===================================================================
--- trunk/psLib/src/dataManip/psMinimize.h	(revision 4330)
+++ trunk/psLib/src/dataManip/psMinimize.h	(revision 4528)
@@ -8,6 +8,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-09 02:11:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38,19 +38,19 @@
 
 /** A data structure for minimization routines.
- *  
+ *
  *  Contains numerical analysis parameters/values
  */
 typedef struct
 {
-    psS32 maxIter;                     ///< Convergence limit
-    psF32 tol;                         ///< Error Tolerance
-    psF32 value;                       ///< Value of function at minimum
-    psS32 iter;                        ///< Number of iterations to date
-    psF32 lastDelta;                   ///< The last difference for the fit
+    const int maxIter;                 ///< Convergence limit
+    const float tol;                   ///< Error Tolerance
+    float value;                       ///< Value of function at minimum
+    int iter;                          ///< Number of iterations to date
+    float lastDelta;                   ///< The last difference for the fit
 }
 psMinimization;
 
 /** Allocates a psMinimization structure.
- *  
+ *
  *  @return psMinimization* :   a new psMinimization struct
 */
@@ -74,5 +74,5 @@
  */
 psPolynomial1D* psVectorFitPolynomial1D(
-    psPolynomial1D* myPoly,            ///< Polynomial to fit
+    psPolynomial1D* poly,            ///< Polynomial to fit
     const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
     const psVector* y,                 ///< Coordinates
@@ -81,8 +81,8 @@
 
 /** Derive a one-dimensional spline fit.
- *    
- *  Given a psSpline1D data structure and a set of x,y vectors, this routine 
+ *
+ *  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
  */
@@ -96,17 +96,17 @@
 /** Specifies the format of a user-defined function that the general Levenberg-
  *  Marquardt minimizer routine will accept.
- *  
- *  @return psF64:   the single float value of the function given the parameters, 
+ *
+ *  @return float:   the single float value of the function given the parameters,
  *       positions, and derivatives.
  */
 typedef
-psF64 (*psMinimizeLMChi2Func)(
+float (*psMinimizeLMChi2Func)(
     psVector *deriv,                   ///< derivatives of the function
-    psVector *params,                  ///< the parameters used to evaluate the function
-    psVector *x                        ///< positions for evaluation
+    const psVector *params,            ///< the parameters used to evaluate the function
+    const psVector *x                  ///< positions for evaluation
 );
 
 /** Minimizes a specified function based on the Levenberg-Marquardt method.
- *  
+ *
  *  @return bool:   True if successful.
  */
@@ -123,5 +123,5 @@
 
 /** Use specified alpha, beta, params to generate a new guess for Alpha, Beta, Params
- *  
+ *
  *  @return psBool:   True if successful.
  */
@@ -138,5 +138,5 @@
 
 /** Function used to set parameters for generating "best guess" in minimizing Chi-Squared value.
- *  
+ *
  *  @return psF64:    Chi-squared value for new guess
  */
@@ -153,10 +153,10 @@
 /** Specifies the format of a user-defined function that the general Powell
  *  minimizer routine will accept.
- *  
- *  @return psF32:   the single float value of the function given the parameters 
+ *
+ *  @return float:   the single float value of the function given the parameters
  *      and coordinate vectors.
 */
 typedef
-psF32 (*psMinimizePowellFunc)(
+float (*psMinimizePowellFunc)(
     const psVector *params,            ///< Parameters used to evaluate the function
     const psArray *coords              ///< Coordinates at which to evaluate
@@ -164,5 +164,5 @@
 
 /** Minimizes a specified function based on the Powell method.
- *  
+ *
  *  @return bool:   True if successful.
  */
@@ -177,5 +177,5 @@
 /** Calculates the one-dimensional Gaussian in a format acceptable to the Levenberg-
  *  Marquardt minimizer routine.
- * 
+ *
  *  @return psVector*:    Calculated values
  */
@@ -188,5 +188,5 @@
 /** Calculates the one-dimensional Gaussian in a format acceptable to the Powell
  *  chi-squared minimizer routine.
- *  
+ *
  *  @return psVector*:   Calculated values
  */
@@ -198,5 +198,5 @@
 /** Specifies the format of a user-defined function that the general Powell chi-
  *  squared minimizer routine will accept.
- *  
+ *
  *  @return psVector*:    Calculated values given the parameters and coordinates.
 */
@@ -208,5 +208,5 @@
 
 /** Minimizes a specified function based on the Powell chi-squared method.
- * 
+ *
  *  @return bool:   True is successful.
  */
@@ -222,5 +222,5 @@
 
 /** Gauss-Jordan numerical solver.
- *  
+ *
  *  @return bool:   True if successful.
  */