Changeset 615 for trunk/archive/pslib/include/psMinimize.h

Timestamp:

May 7, 2004, 2:12:40 PM (22 years ago)

Author:

Paul Price

Message:

Added possibility of available derivative information in psMinimize,
and changed the order of variables for psMinimize and psMinimizeChi2.

File:

• trunk/archive/pslib/include/psMinimize.h (modified) (2 diffs)

trunk/archive/pslib/include/psMinimize.h

@@ -12 +12 @@
  */
 
-/** Minimize a particular non-linear function */
+/** Find the minimum of a particular non-linear function */
 psFloatArray *
-psMinimize(float (*myFunction)(const psFloatArray *restrict), ///< Function to minimize
-           psFloatArray *restrict initialGuess, ///< Initial guess
-           psIntArray *restrict paramMask //!< 1 = fit for parameter, 0 = hold parameter constant
+psMinimize(psFloatArray *restrict initialGuess, ///< Initial guess and answer
+           float (*myFunction)(const psFloatArray *restrict), ///< Function to minimize
+           float (*myFuncDeriv)(const psFloatArray *restrict), ///< Derivatives of function, or NULL
+           const psIntArray *restrict paramMask //!< 1 = fit for parameter, 0 = hold parameter constant
            );
 
@@ -22 +23 @@
 /** Minimize chi^2 for input data */
 psFloatArray *
-psMinimizeChi2(float (*evalModel)(const psFloatArray *restrict,
+psMinimizeChi2(psFloatArray *restrict initialGuess, ///< Initial guess and answer
+               float (*evalModel)(const psFloatArray *restrict,
                                   const psFloatArray *restrict), ///< Model to fit; (domain and params)
                const psFloatArray *restrict domain, ///< The domain values for the corresponding measurements
                const psFloatArray *restrict data, ///< Data to fit
                const psFloatArray *restrict errors, ///< Errors in the data
-               psFloatArray *restrict initialGuess, ///< Initial guess
                const psIntArray *restrict paramMask ///< 1 = fit for parameter, 0 = hold parameter constant
     );