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

Timestamp:

May 20, 2004, 6:12:37 PM (22 years ago)

Author:

eugene

Message:

substantial API changes based on change to PSLib SDRS

File:

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

trunk/archive/pslib/include/psMinimize.h

@@ -15 +15 @@
 psVector *
 psMinimize(psVector *restrict initialGuess, ///< Initial guess and answer
-           float (*myFunction)(const psVector *restrict), ///< Function to minimize
-           float (*myFuncDeriv)(const psVector *restrict), ///< Derivatives of function, or NULL
+           float (*myFunction)(const psVector *restrict, const psVector *restrict), ///< Function to minimize
+           float (*myFuncDeriv)(const psVector *restrict, const psVector *restrict), ///< Derivatives of function, or NULL
            const psVector *restrict paramMask) ///< 1 = fit for parameter, 0 = hold parameter constant
 ;
@@ -24 +24 @@
 psVector *
 psMinimizeChi2(psVector *restrict initialGuess, ///< Initial guess and answer
-               float (*evalModel)(const psVector *restrict,
-                                  const psVector *restrict), ///< Model to fit; (domain and params)
+               float (*evalModel)(const psVector *restrict, const psVector *restrict), ///< Model to fit; (domain and params)
                const psVector *restrict domain, ///< The domain values for the corresponding measurements
                const psVector *restrict data, ///< Data to fit
                const psVector *restrict errors, ///< Errors in the data
-               const psVector *restrict paramMask) ///< 1 = fit for parameter, 0 = hold parameter constant
+               const psVector *restrict paramMask, ///< 1 = fit for parameter, 0 = hold parameter constant
+               float ChiSq)             ///< calculated chisq of fit
 ;
 
@@ -35 +35 @@
 psPolynomial1D *
 psVectorFitPolynomial(psPolynomial1D myPoly, ///< Polynomial to fit
-                     const psVector *restrict x, ///< Ordinates (or NULL to just use the indices)
-                     const psVector *restrict y, ///< Coordinates
-                     const psVector *restrict yErr) ///< Errors in coordinates, or NULL
+                      const psVector *restrict x, ///< Ordinates (or NULL to just use the indices)
+                      const psVector *restrict y, ///< Coordinates
+                      const psVector *restrict yErr) ///< Errors in coordinates, or NULL
 ;