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

Timestamp:

May 5, 2005, 12:10:12 PM (21 years ago)

Author:

gusciora

Message:

Eugene's mods to LM minimization.

File:

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

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:23 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-05 22:10:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
     psF32 tol;                         ///< Error Tolerance
     psF32 value;                       ///< Value of function at minimum
-    psS32 iter;                          ///< Number of iterations required
+    psS32 iter;                          ///< Number of iterations to date
     psF32 lastDelta;                   ///< The last difference for the fit
 }
@@ -77 +77 @@
 
 typedef
-psVector* (*psMinimizeLMChi2Func)(psImage *deriv,
-                                  const psVector *params,
-                                  const psArray *x);
+psF64 (*psMinimizeLMChi2Func)(psVector *deriv,
+                              psVector *params,
+                              psVector *x);
 
 psBool psMinimizeLMChi2(psMinimization *min,
@@ -88 +88 @@
                         const psVector *y,
                         const psVector *yErr,
+                        psMinimizeLMChi2Func func);
+
+psBool p_psMinLM_GuessABP (psImage  *Alpha,
+                           psVector *Beta,
+                           psVector *Params,
+                           psImage  *alpha,
+                           psVector *beta,
+                           psVector *params,
+                           psF64 lambda);
+
+psF64 p_psMinLM_SetABX (psImage  *alpha,
+                        psVector *beta,
+                        psVector *params,
+                        const psArray  *x,
+                        const psVector *y,
+                        const psVector *dy,
                         psMinimizeLMChi2Func func);
 
@@ -119 +135 @@
                             psMinimizeChi2PowellFunc func);
 
-
+// XXX EAM : psGaussJordan provided as an alternate to LU Decomp for psMinimizeLMChi2
+bool psGaussJordan (psImage *a, psVector *b);
 
 /* \} */// End of MathGroup Functions