Index: trunk/psLib/src/math/psMinimize.c
===================================================================
--- trunk/psLib/src/math/psMinimize.c	(revision 1407)
+++ trunk/psLib/src/math/psMinimize.c	(revision 1440)
@@ -10,6 +10,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-07 00:06:06 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-09 23:34:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -99,11 +99,11 @@
     size_t n;                   // Number of data points points in domain.
     int paramCount;             // Number of non-masked parameters.
-    psVector *restrict initialGuess;
-    const psImage *restrict domain;
-    const psVector *restrict data;
-    const psVector *restrict errors;
-    const psVector *restrict paramMask;
-    float (*evalModel) (const psVector *, const psVector *);
-    float (*d_evalModel) (const psVector *, const psVector *, int);
+    psVector* restrict initialGuess;
+    const psImage* restrict domain;
+    const psVector* restrict data;
+    const psVector* restrict errors;
+    const psVector* restrict paramMask;
+    float (*evalModel) (const psVector* , const psVector* );
+    float (*d_evalModel) (const psVector* , const psVector* , int);
 }
 psMinChi2Data;
@@ -112,9 +112,9 @@
 {
     int paramCount;             // Number of non-masked parameters.
-    psVector *restrict initialGuess;
-    const psVector *restrict coord;
-    const psVector *restrict paramMask;
-    float (*evalModel) (const psVector *, const psVector *);
-    float (*d_evalModel) (const psVector *, const psVector *, int);
+    psVector* restrict initialGuess;
+    const psVector* restrict coord;
+    const psVector* restrict paramMask;
+    float (*evalModel) (const psVector* , const psVector* );
+    float (*d_evalModel) (const psVector* , const psVector* , int);
 }
 psMinimizeData;
@@ -162,9 +162,9 @@
     int j;                      // Loop index variable.
     float tmpf;                 // Temporary floating point variable.
-    const psVector *restrict coord = ((psMinimizeData *) funcData)->coord;
-    const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask;
-    psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess;
-    float (*evalModel) (const psVector *, const psVector *) = ((psMinimizeData *) funcData)->evalModel;
-    psVector *inputParameterList = NULL;
+    const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord;
+    const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask;
+    psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess;
+    float (*evalModel) (const psVector* , const psVector* ) = ((psMinimizeData* ) funcData)->evalModel;
+    psVector* inputParameterList = NULL;
 
     // The GSL routines will call this function with the masked parameters
@@ -216,10 +216,10 @@
     int j;                      // Loop index variable.
     float tmpf;                 // Temporary floating point variable.
-    const psVector *restrict coord = ((psMinimizeData *) funcData)->coord;
-    const psVector *restrict mask = ((psMinimizeData *) funcData)->paramMask;
-    psVector *restrict initialGuess = ((psMinimizeData *) funcData)->initialGuess;
-    float (*d_evalModel) (const psVector *, const psVector *, int) =
-        ((psMinimizeData *) funcData)->d_evalModel;
-    psVector *inputParameterList = NULL;
+    const psVector* restrict coord = ((psMinimizeData* ) funcData)->coord;
+    const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask;
+    psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess;
+    float (*d_evalModel) (const psVector* , const psVector* , int) =
+        ((psMinimizeData* ) funcData)->d_evalModel;
+    psVector* inputParameterList = NULL;
 
     // The GSL routines will call this function with the masked parameters
@@ -293,12 +293,12 @@
     int j;                      // Loop index variable.
     float tmpf;                 // Temporary floating point variable.
-    const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain;
-    const psVector *restrict data = ((psMinChi2Data *) funcData)->data;
-    const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors;
-    const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask;
-    psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess;
-    float (*evalModel) (const psVector *, const psVector *) = ((psMinChi2Data *) funcData)->evalModel;
-    psVector *inputParameterList = NULL;
-    psVector *tmpVecPtr = NULL;
+    const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain;
+    const psVector* restrict data = ((psMinChi2Data* ) funcData)->data;
+    const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors;
+    const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask;
+    psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess;
+    float (*evalModel) (const psVector* , const psVector* ) = ((psMinChi2Data* ) funcData)->evalModel;
+    psVector* inputParameterList = NULL;
+    psVector* tmpVecPtr = NULL;
 
     tmpVecPtr = psVectorAlloc(domain->numCols, PS_TYPE_F32);
@@ -360,12 +360,12 @@
 int p_psMinChi2FuncDeriv(const gsl_vector * params, void *funcData, gsl_matrix * J)
 {
-    const psImage *restrict domain = ((psMinChi2Data *) funcData)->domain;
-    const psVector *restrict errors = ((psMinChi2Data *) funcData)->errors;
-    const psVector *restrict mask = ((psMinChi2Data *) funcData)->paramMask;
-    psVector *restrict initialGuess = ((psMinChi2Data *) funcData)->initialGuess;
-    psVector *inputParameterList = NULL;
-    psVector *tmpVecPtr = NULL;
-    float (*d_evalModel) (const psVector *, const psVector *, int) =
-        ((psMinChi2Data *) funcData)->d_evalModel;
+    const psImage* restrict domain = ((psMinChi2Data* ) funcData)->domain;
+    const psVector* restrict errors = ((psMinChi2Data* ) funcData)->errors;
+    const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask;
+    psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess;
+    psVector* inputParameterList = NULL;
+    psVector* tmpVecPtr = NULL;
+    float (*d_evalModel) (const psVector* , const psVector* , int) =
+        ((psMinChi2Data* ) funcData)->d_evalModel;
 
     size_t i;
@@ -426,5 +426,5 @@
 returned as a psVector sums.
  *****************************************************************************/
-void p_psBuildSums1D(double x, int polyOrder, psVector * sums)
+void p_psBuildSums1D(double x, int polyOrder, psVector* sums)
 {
     int i = 0;
@@ -442,8 +442,8 @@
 values of the vector will be scaled uniformly between -1.0 and 1.0.
  *****************************************************************************/
-psVector *psBuildImageScalingFactors(int x)
+psVector* psBuildImageScalingFactors(int x)
 {
     int i = 0;                  // loop index variable.
-    psVector *imageScalingFactors = NULL;
+    psVector* imageScalingFactors = NULL;
 
     imageScalingFactors = psVectorAlloc(x, PS_TYPE_F32);
@@ -556,8 +556,8 @@
 parameters of that function such that the ...
  *****************************************************************************/
-psVector *psMinimize(psVector * restrict initialGuess,
-                     float (*myFunction) (const psVector * restrict, const psVector * restrict),
-                     float (*myFunctionDeriv) (const psVector * restrict, const psVector * restrict, int),
-                     const psVector * restrict coord, const psVector * restrict paramMask)
+psVector* psMinimize(psVector* restrict initialGuess,
+                     float (*myFunction) (const psVector* restrict, const psVector* restrict),
+                     float (*myFunctionDeriv) (const psVector* restrict, const psVector* restrict, int),
+                     const psVector* restrict coord, const psVector* restrict paramMask)
 {
     int status;
@@ -664,10 +664,10 @@
     such that they best fit the supplied data points.
  *****************************************************************************/
-psVector *psMinimizeChi2(float (*evalModel) (const psVector * restrict, const psVector * restrict),
-                         float (*DevalModel) (const psVector * restrict, const psVector * restrict, int),
-                         const psImage * restrict domain,
-                         const psVector * restrict data,
-                         const psVector * restrict errors,
-                         psVector * restrict initialGuess, const psVector * restrict paramMask, float *chiSq)
+psVector* psMinimizeChi2(float (*evalModel) (const psVector* restrict, const psVector* restrict),
+                         float (*DevalModel) (const psVector* restrict, const psVector* restrict, int),
+                         const psImage* restrict domain,
+                         const psVector* restrict data,
+                         const psVector* restrict errors,
+                         psVector* restrict initialGuess, const psVector* restrict paramMask, float *chiSq)
 {
     int numData = domain->numRows;      // Number of data points
@@ -847,19 +847,19 @@
 NOTE: yErr is currently ignored.
  *****************************************************************************/
-psPolynomial1D *psVectorFitPolynomial1D(psPolynomial1D * myPoly,
-                                        const psVector * restrict x,
-                                        const psVector * restrict y, const psVector * restrict yErr)
+psPolynomial1D* psVectorFitPolynomial1D(psPolynomial1D* myPoly,
+                                        const psVector* restrict x,
+                                        const psVector* restrict y, const psVector* restrict yErr)
 {
     int polyOrder = myPoly->n;
-    psImage *A = NULL;
-    psImage *ALUD = NULL;
-    psVector *B = NULL;
-    psVector *outPerm = NULL;
-    psVector *X = NULL;         // NOTE: do we need this?
-    psVector *coeffs = NULL;
+    psImage* A = NULL;
+    psImage* ALUD = NULL;
+    psVector* B = NULL;
+    psVector* outPerm = NULL;
+    psVector* X = NULL;         // NOTE: do we need this?
+    psVector* coeffs = NULL;
     int i = 0;
     int j = 0;
     int k = 0;
-    psVector *xSums = NULL;
+    psVector* xSums = NULL;
 
     // printf("psVectorFitPolynomial1D()\n");