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

Timestamp:

May 13, 2004, 1:16:19 PM (22 years ago)

Author:

eugene

Message:

psFloatArray, psDoubleArray, psIntArray, etc merged into
psVector. psVector is analogous to psImage. reference to the old
forms have been converted to psVector. the file psStdArrays.h has
been removed and replaced with psVector.h (containing the vector
functions) and psTypes.h (containing the basic data types)

File:

• trunk/archive/pslib/include/psMinimize.h (modified) (1 diff)

trunk/archive/pslib/include/psMinimize.h

@@ -13 +13 @@
 
 /** Find the minimum of a particular non-linear function */
-psFloatArray *
-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
-           );
+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
+           const psVector *restrict paramMask) ///< 1 = fit for parameter, 0 = hold parameter constant
+;
 
 
 /** Minimize chi^2 for input data */
-psFloatArray *
-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
-               const psIntArray *restrict paramMask ///< 1 = fit for parameter, 0 = hold parameter constant
-    );
+psVector *
+psMinimizeChi2(psVector *restrict initialGuess, ///< Initial guess and answer
+               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
+;
 
 /** Derive a polynomial fit by chi^2 minimisation --- can be done analytically */
 psPolynomial1D *
-psGetArrayPolynomial(psPolynomial1D myPoly, ///< Polynomial to fit
-                     const psFloatArray *restrict x, ///< Ordinates (or NULL to just use the indices)
-                     const psFloatArray *restrict y, ///< Coordinates
-                     const psFloatArray *restrict yErr ///< Errors in coordinates, or NULL
-    );
+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
+;
 
 /* \} */ // End of MathGroup Functions