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

Timestamp:

Aug 8, 2005, 11:42:07 AM (21 years ago)

Author:

gusciora

Message:

I incorporated EAMs modifications. There might still be bugs with this code.

File:

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

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-16 00:42:28 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-08 21:42:07 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -135 +135 @@
     psVector *Beta,                    ///< New Beta guess
     psVector *Params,                  ///< New Params guess
-    psImage  *alpha,                   ///< Old Alpha guess
-    psVector *beta,                    ///< Old Beta guess
-    psVector *params,                  ///< Old Params guess
+    const psImage  *alpha,             ///< Old Alpha guess
+    const psVector *beta,              ///< Old Beta guess
+    const psVector *params,            ///< Old Params guess
+    const psVector *paramMask,         ///< Param Mask
     psF64 lambda                       ///< Factor used in update
     //XXX Got Better Desc?
@@ -149 +150 @@
     psImage  *alpha,                   ///< alpha guess
     psVector *beta,                    ///< beta guess
-    psVector *params,                  ///< params guess
+    const psVector *params,            ///< params guess
+    const psVector *paramMask,         ///< param mask
     const psArray  *x,                 ///< Measurement ordinates
     const psVector *y,                 ///< Measurement coordinates
@@ -155 +157 @@
     psMinimizeLMChi2Func func          ///< Specified function
 );
+
 
 /** Specifies the format of a user-defined function that the general Powell