Changeset 28998 for trunk/psLib/src/math/psMinimizePowell.c

Timestamp:

Aug 20, 2010, 11:47:48 AM (16 years ago)

Author:

eugene

Message:

added pre-ffted kernel convolutions, changed minimization to accept maxTol and minTol

File:

• trunk/psLib/src/math/psMinimizePowell.c (modified) (4 diffs)

trunk/psLib/src/math/psMinimizePowell.c

@@ -457 +457 @@
 
         mul = bracket->data.F32[1];
-        if ((fabs(a-b) < min->tol) && (fabs(b-c) < min->tol)) {
+        if ((fabs(a-b) < min->minTol) && (fabs(b-c) < min->minTol)) {
             PS_VECTOR_ADD_MULTIPLE(params, paramMask, line, params, mul);
             min->value = func(params, coords);
@@ -524 +524 @@
     psTrace("psLib.math", 4, "---- psMinimizePowell() begin ----\n");
     psTrace("psLib.math", 6, "min->maxIter is %d\n", min->maxIter);
-    psTrace("psLib.math", 6, "min->tol is %f\n", min->tol);
+    psTrace("psLib.math", 6, "min->minTol is %f\n", min->minTol);
 
     if (paramMask == NULL) {
@@ -573 +573 @@
         for (i=0;i<numDims;i++) {
             if (myParamMask->data.PS_TYPE_VECTOR_MASK_DATA[i] == 0) {
+
                 P_PSMINIMIZATION_SET_MAXITER((&dummyMin),PS_MINIMIZE_POWELL_LINEMIN_MAX_ITERATIONS);
-                *(float*)&dummyMin.tol = PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE;
+                P_PSMINIMIZATION_SET_MIN_TOL((&dummyMin),PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE);
+
                 mul = LineMin(&dummyMin, Q, ((psVector *) v->data[i]),
                               myParamMask, coords, func);
@@ -677 +679 @@
 
         // 8: Go to step 3 until the change is less than some tolerance.
-        if (fabs(baseFuncVal - currFuncVal) <= min->tol) {
+        if (fabs(baseFuncVal - currFuncVal) <= min->minTol) {
             psFree(v);
             psFree(pQP);