Changeset 4321 for trunk/psLib/src/math/psMinimize.h

Timestamp:

Jun 20, 2005, 12:42:30 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

File:

• trunk/psLib/src/math/psMinimize.h (modified) (6 diffs)

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-16 03:51:58 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
 */
 psMinimization *psMinimizationAlloc(
-    psS32 maxIter,                     ///< Number of minimization iterations to perform.
-    psF32 tol                          ///< Requested error tolerance
+    int maxIter,                       ///< Number of minimization iterations to perform.
+    float tol                          ///< Requested error tolerance
 );
 
@@ -111 +111 @@
  *  @return psBool:   True if successful.
  */
-psBool psMinimizeLMChi2(
+bool psMinimizeLMChi2(
     psMinimization *min,               ///< Minimization specification
     psImage *covar,                    ///< Covariance matrix
@@ -167 +167 @@
  *  @return psBool:   True if successful.
  */
-psBool psMinimizePowell(
+bool psMinimizePowell(
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
@@ -211 +211 @@
  *  @return psBool:   True is successful.
  */
-psBool psMinimizeChi2Powell(
+bool psMinimizeChi2Powell(
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
@@ -218 +218 @@
     const psVector *value,             ///< Measured values at the coordinates
     const psVector *error,             ///< Errors in the measure values (or NULL)
-    psMinimizeChi2PowellFunc func      ///< Specified function
+    psMinimizeChi2PowellFunc model     ///< Specified function
 );