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

Timestamp:

Sep 28, 2005, 4:13:54 PM (21 years ago)

Author:

gusciora

Message:

I added EAM's new version of LM minimization.

File:

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

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-11 22:18:40 $
+ *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-29 02:13:54 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -202 +202 @@
     psMinimizeLMChi2Func func          ///< Specified function
 );
+bool psMinimizeLMChi2_OLD(
+    psMinimization *min,               ///< Minimization specification
+    psImage *covar,                    ///< Covariance matrix
+    psVector *params,                  ///< "Best Guess" for the parameters that minimize func
+    const psVector *paramMask,         ///< Parameters to be held fixed by the minimizer
+    const psArray *x,                  ///< Measurement ordinates of multiple vectors
+    const psVector *y,                 ///< Measurement coordinates
+    const psVector *yErr,              ///< Errors in the measurement coordinates
+    psMinimizeLMChi2Func func          ///< Specified function
+);
 
 bool psMinimizeGaussNewtonDelta (
@@ -217 +227 @@
  *  @return psBool:   True if successful.
  */
-psBool p_psMinLM_GuessABP(
+psBool p_psMinLM_GuessABP_OLD(
     psImage  *Alpha,                   ///< New Alpha guess
     psVector *Beta,                    ///< New Beta guess