Changeset 1468 for trunk/psLib/src/dataManip/psMinimize.c

Timestamp:

Aug 10, 2004, 5:17:03 PM (22 years ago)

Author:

desonia

Message:

cleanup.

File:

• trunk/psLib/src/dataManip/psMinimize.c (modified) (9 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -10 +10 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:34:57 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-11 03:17:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104 +104 @@
     const psVector* restrict errors;
     const psVector* restrict paramMask;
-    float (*evalModel) (const psVector* , const psVector* );
-    float (*d_evalModel) (const psVector* , const psVector* , int);
+    psMinimizeFunction evalModel;
+    psMinimizeFunctionDeriv d_evalModel;
 }
 psMinChi2Data;
@@ -115 +115 @@
     const psVector* restrict coord;
     const psVector* restrict paramMask;
-    float (*evalModel) (const psVector* , const psVector* );
-    float (*d_evalModel) (const psVector* , const psVector* , int);
+    psMinimizeFunction evalModel;
+    psMinimizeFunctionDeriv d_evalModel;
 }
 psMinimizeData;
@@ -165 +165 @@
     const psVector* restrict mask = ((psMinimizeData* ) funcData)->paramMask;
     psVector* restrict initialGuess = ((psMinimizeData* ) funcData)->initialGuess;
-    float (*evalModel) (const psVector* , const psVector* ) = ((psMinimizeData* ) funcData)->evalModel;
+    psMinimizeFunction evalModel = ((psMinimizeData* ) funcData)->evalModel;
     psVector* inputParameterList = NULL;
 
@@ -219 +219 @@
     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;
+    psMinimizeFunctionDeriv d_evalModel = ((psMinimizeData* ) funcData)->d_evalModel;
     psVector* inputParameterList = NULL;
 
@@ -298 +297 @@
     const psVector* restrict mask = ((psMinChi2Data* ) funcData)->paramMask;
     psVector* restrict initialGuess = ((psMinChi2Data* ) funcData)->initialGuess;
-    float (*evalModel) (const psVector* , const psVector* ) = ((psMinChi2Data* ) funcData)->evalModel;
+    psMinimizeFunction evalModel = ((psMinChi2Data* ) funcData)->evalModel;
     psVector* inputParameterList = NULL;
     psVector* tmpVecPtr = NULL;
@@ -366 +365 @@
     psVector* inputParameterList = NULL;
     psVector* tmpVecPtr = NULL;
-    float (*d_evalModel) (const psVector* , const psVector* , int) =
-        ((psMinChi2Data* ) funcData)->d_evalModel;
+    psMinimizeFunctionDeriv d_evalModel = ((psMinChi2Data* ) funcData)->d_evalModel;
 
     size_t i;
@@ -557 +555 @@
  *****************************************************************************/
 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)
+                     psMinimizeFunction myFunction,
+                     psMinimizeFunctionDeriv myFunctionDeriv,
+                     const psVector* restrict coord,
+                     const psVector* restrict paramMask)
 {
     int status;
@@ -664 +663 @@
     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),
+psVector* psMinimizeChi2(psMinimizeFunction evalModel,
+                         psMinimizeFunctionDeriv DevalModel,
                          const psImage* restrict domain,
                          const psVector* restrict data,
                          const psVector* restrict errors,
-                         psVector* restrict initialGuess, const psVector* restrict paramMask, float *chiSq)
+                         psVector* restrict initialGuess,
+                         const psVector* restrict paramMask,
+                         float *chiSq)
 {
     int numData = domain->numRows;      // Number of data points