Changeset 1609

Timestamp:

Aug 24, 2004, 9:57:03 AM (22 years ago)

Author:

gusciora

Message:

...

Location:

trunk/psLib/src

Files:

• dataManip/psMinimize.c (modified) (2 diffs)
• dataManip/psMinimize.h (modified) (2 diffs)
• math/psMinimize.c (modified) (2 diffs)
• math/psMinimize.h (modified) (2 diffs)

trunk/psLib/src/dataManip/psMinimize.c

@@ -10 +10 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-11 03:17:03 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-24 19:57:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -939 +939 @@
     return (myPoly);
 }
+
+bool psMinimizePowell(psMinimization *min,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *coords,
+                      psMinimizePowellFunc func)
+{
+
+
+
+
+
+
+
+
+    return(true);
+}

trunk/psLib/src/dataManip/psMinimize.h

@@ -3 +3 @@
 
 #include "psFunctions.h"
+#include "psArray.h"
+#include "psVector.h"
 
 /** \file psMinimize.h
@@ -101 +103 @@
 );
 
+typedef struct
+{
+    const int maxIter;
+    const float tol;
+    float value;
+    int iter;
+    float lastDelta;
+}
+psMinimization;
+
+psMinimization *psMinimizationAlloc(int maxIter, float tol);
+
+typedef float (*psMinimizePowellFunc) (const psVector *params,
+                                       const psArray *coords);
+
+bool psMinimizePowell(psMinimization *min,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *coords,
+                      psMinimizePowellFunc func);
+
+typedef psVector* (psMinimizeChi2PowellFunc) (const psVector *params,
+        const psArray *coords);
+
+bool psMinimizeChi2Powell(psMinimization *min,
+                          psVector *params,
+                          const psVector *paramMask,
+                          const psArray *coords,
+                          const psVector *value,
+                          const psVector *error,
+                          psMinimizeChi2PowellFunc func);
+
+
 /* \} */// End of MathGroup Functions
 

trunk/psLib/src/math/psMinimize.c

@@ -10 +10 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-11 03:17:03 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-24 19:57:03 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -939 +939 @@
     return (myPoly);
 }
+
+bool psMinimizePowell(psMinimization *min,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *coords,
+                      psMinimizePowellFunc func)
+{
+
+
+
+
+
+
+
+
+    return(true);
+}

trunk/psLib/src/math/psMinimize.h

@@ -3 +3 @@
 
 #include "psFunctions.h"
+#include "psArray.h"
+#include "psVector.h"
 
 /** \file psMinimize.h
@@ -101 +103 @@
 );
 
+typedef struct
+{
+    const int maxIter;
+    const float tol;
+    float value;
+    int iter;
+    float lastDelta;
+}
+psMinimization;
+
+psMinimization *psMinimizationAlloc(int maxIter, float tol);
+
+typedef float (*psMinimizePowellFunc) (const psVector *params,
+                                       const psArray *coords);
+
+bool psMinimizePowell(psMinimization *min,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *coords,
+                      psMinimizePowellFunc func);
+
+typedef psVector* (psMinimizeChi2PowellFunc) (const psVector *params,
+        const psArray *coords);
+
+bool psMinimizeChi2Powell(psMinimization *min,
+                          psVector *params,
+                          const psVector *paramMask,
+                          const psArray *coords,
+                          const psVector *value,
+                          const psVector *error,
+                          psMinimizeChi2PowellFunc func);
+
+
 /* \} */// End of MathGroup Functions