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

Timestamp:

Sep 11, 2005, 12:18:40 PM (21 years ago)

Author:

gusciora

Message:

....

File:

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

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-07 23:46:04 $
+ *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-11 22:18:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -85 +85 @@
  *  @return psPolynomial1D*    polynomial fit
  */
-psPolynomial1D* psVectorFitPolynomial1D(
-    psPolynomial1D* poly,            ///< Polynomial to fit
-    const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
-    const psVector* y,                 ///< Coordinates
-    const psVector* yErr               ///< Errors in coordinates, or NULL
-);
-
-
-
-
-
-psPolynomial1D *psVectorFitPolynomial1D_NEW(
+
+psPolynomial1D *psVectorFitPolynomial1D(
     psPolynomial1D *poly,
     const psVector *mask,
@@ -105 +95 @@
 );
 
-psPolynomial2D *psVectorFitPolynomial2D_NEW(
-    psPolynomial1D *poly,
+psPolynomial2D *psVectorFitPolynomial2D(
+    psPolynomial2D *poly,
     const psVector *mask,
     psMaskType maskValue,
@@ -115 +105 @@
 );
 
-psPolynomial3D *psVectorFitPolynomial3D_NEW(
-    psPolynomial1D *poly,
+psPolynomial3D *psVectorFitPolynomial3D(
+    psPolynomial3D *poly,
     const psVector *mask,
     psMaskType maskValue,
@@ -126 +116 @@
 );
 
-psPolynomial4D *psVectorFitPolynomial4D_NEW(
-    psPolynomial1D *poly,
+psPolynomial4D *psVectorFitPolynomial4D(
+    psPolynomial4D *poly,
     const psVector *mask,
     psMaskType maskValue,
@@ -139 +129 @@
 
 
-psPolynomial1D *psVectorClipFitPolynomial1D_NEW(
+psPolynomial1D *psVectorClipFitPolynomial1D(
     psPolynomial1D *poly,
     psStats *stats,
@@ -149 +139 @@
 );
 
-psPolynomial2D *psVectorClipFitPolynomial2D_NEW(
-    psPolynomial1D *poly,
+psPolynomial2D *psVectorClipFitPolynomial2D(
+    psPolynomial2D *poly,
     psStats *stats,
     const psVector *mask,
@@ -160 +150 @@
 );
 
-psPolynomial3D *psVectorClipFitPolynomial3D_NEW(
-    psPolynomial1D *poly,
+psPolynomial3D *psVectorClipFitPolynomial3D(
+    psPolynomial3D *poly,
     psStats *stats,
     const psVector *mask,
@@ -172 +162 @@
 );
 
-psPolynomial4D *psVectorClipFitPolynomial4D_NEW(
-    psPolynomial1D *poly,
+psPolynomial4D *psVectorClipFitPolynomial4D(
+    psPolynomial4D *poly,
     psStats *stats,
     const psVector *mask,
@@ -183 +173 @@
     const psVector *z,
     const psVector *t
-);
-
-
-
-
-/** Derive a one-dimensional spline fit.
- *
- *  Given a psSpline1D data structure and a set of x,y vectors, this routine
- *  generates the linear splines which satisfy those data points.
- *
- *  @return psSpline1D*:  the calculated one-dimensional splines
- */
-psSpline1D *psVectorFitSpline1D(
-    psSpline1D *mySpline,              ///< The spline which will be generated.
-    const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
-    const psVector* y,                 ///< Coordinates
-    const psVector* yErr               ///< Errors in coordinates, or NULL
-);
-psSpline1D *psVectorFitSpline1DNEW(
-    const psVector* x,                 ///< Ordinates (or NULL to just use the indices)
-    const psVector* y,                 ///< Coordinates
-    int nKnots
 );
 
@@ -233 +201 @@
     const psVector *yErr,              ///< Errors in the measurement coordinates
     psMinimizeLMChi2Func func          ///< Specified function
+);
+
+bool psMinimizeGaussNewtonDelta (
+    psVector *delta,
+    const psVector *params,
+    const psVector *paramMask,
+    const psArray  *x,
+    const psVector *y,
+    const psVector *yErr,
+    psMinimizeLMChi2Func func
 );