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

Timestamp:

Sep 8, 2004, 1:32:03 PM (22 years ago)

Author:

gusciora

Message:

* empty log message *

File:

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

trunk/psLib/src/math/psMinimize.h

@@ +1 @@
+/** @file  psMinimize.c
+ *  \brief basic minimization functions
+ *  @ingroup Math
+ *
+ *  This file will contain function prototypes...
+ *
+ *  @author George Gusciora, MHPCC
+ *
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-09-08 23:32:03 $
+ *
+ *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ *
+ */
+
 #if !defined(PS_MINIMIZE_H)
 #define PS_MINIMIZE_H
@@ -5 +20 @@
 #include "psArray.h"
 #include "psVector.h"
+#include "psMatrix.h"
 
 /** \file psMinimize.h
@@ -115 +131 @@
 psMinimization *psMinimizationAlloc(int maxIter, float tol);
 
+
+
+typedef float (*psMinimizeLMFunc) (psVector *deriv,
+                                   const psVector *params,
+                                   const psArray *coords);
+
+bool psMinimizeLM(psMinimization *min,
+                  psImage *covar,
+                  psVector *params,
+                  const psVector *paramMask,
+                  const psArray *coords,
+                  psMinimizeLMFunc func);
+
+
+
 typedef float (*psMinimizePowellFunc) (const psVector *params,
                                        const psArray *coords);
@@ -124 +155 @@
                       psMinimizePowellFunc func);
 
-typedef psVector* (psMinimizeChi2PowellFunc) (const psVector *params,
+typedef psVector* (*psMinimizeChi2PowellFunc) (const psVector *params,
         const psArray *coords);