Changeset 2228 for trunk/psLib/src/dataManip/psMinimize.h

Timestamp:

Oct 28, 2004, 12:47:00 PM (22 years ago)

Author:

gusciora

Message:

Modifying the minimization algorithms.

File:

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

trunk/psLib/src/dataManip/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 23:31:43 $
+ *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-28 22:46:57 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -81 +81 @@
                                   const psArray *x);
 
-/*
-psVector *psMinimizeLMChi2Gauss1D(psImage *deriv,
-                                  const psVector *params,
-                                  const psArray *coords)
-{
-    psVector *x = (psVector *) coords->data[0];
-    psVector *y = (psVector *) coords->data[1];
-    psVector *yErr = NULL;
-    int i;
-    int j;
-    float normalization = params->data.F32[0];
-    float center = params->data.F32[1];
-    float stdev = params->data.F32[2];
-    psVector *out = psVectorAlloc(x->n, PS_TYPE_F32);
- 
- 
-    if (deriv == NULL) {
-        deriv = psImageAlloc(params->n, x->n, PS_TYPE_F32);
-    }
- 
-    if (coords->n == 2) {
-        yErr = (psVector *) coords->data[2];
-    }
- 
-    for (i=0;i<x->n;i++) {
-        out->data.F32[i] = psGaussian(x->data.F32[i], center, stdev, 1);
-    }
- 
-    for (i=0;i<x->n;i++) {
-        for (j=0;j<params->n;j++) {
-            deriv->data.F32[i][j] = the derivative of the gaussian w.r.t. the j-th parameter at the coord x[i]
-        }
-    }
-    return(out);
-}
-*/
-
 psBool psMinimizeLMChi2(psMinimization *min,
                         psImage *covar,
@@ -137 +100 @@
                         psMinimizePowellFunc func);
 
+psVector *psMinimizeLMChi2Gauss1D(psImage *deriv,
+                                  const psVector *params,
+                                  const psArray *coords);
+
 typedef
 psVector *(*psMinimizeChi2PowellFunc)(const psVector *params,