Changeset 28634 for trunk

Timestamp:

Jul 7, 2010, 6:31:37 PM (16 years ago)

Author:

Paul Price

Message:

Allow NULL constraint.

File:

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

trunk/psLib/src/math/psMinimizePowell.c

@@ -83 +83 @@
 f(param + b * line) < f(param + c * line)
 a < b < c
- 
+
 Algorithm:
- 
+
 XXX completely ad hoc:
 start with the user-supplied starting parameter and
 call that b.  Calculate a/c as a fractional amount smaller/larger than b.
 Repeat this process until a local minimum is found.
- 
+
 XXX: new algorithm:
 start at x=0, expand in one direction until the function
@@ -96 +96 @@
 increases, or x is too large.  If thst does not work, expand in the other
 direction.
- 
+
 XXX: output bracket vector should be an input as well.
 *****************************************************************************/
@@ -335 +335 @@
 along that vector and returns the offset along that vector at which the
 minimum is determined.
- 
+
 XXX: This routine is not very efficient in terms of total evaluations of the
 function.
@@ -491 +491 @@
 points at which the function is varied are in the argument "coords" which is
 a psArray of psVectors: each vector represents a different coordinate.
- 
+
 XXX: We do not use Brent's method.
  *****************************************************************************/
@@ -707 +707 @@
 This routine is to be used with the psMinimizeChi2Powell() function below.
 and the psMinimizePowell() function above.
- 
+
 The basic idea is calculate chi-squared for a set of params/coords/errors.
 This functions uses global variables to receive the function pointer, the
@@ -762 +762 @@
 This routine must minimize the chi-squared match of a set of data points and
 values for a possibly multi-dimensional function.
- 
+
 The basic idea is to use the psMinimizePowell() function defined above.  In
 order to do so, we defined above a function myPowellChi2Func() which takes
@@ -789 +789 @@
     newCoords->data[coords->n + 2] = &model;
 
-    bool success = psMinimizePowell(min, params, constraint->paramMask, newCoords, myPowellChi2Func);
+    bool success = psMinimizePowell(min, params, constraint ? constraint->paramMask : NULL,
+                                    newCoords, myPowellChi2Func);
 
     newCoords->data[coords->n - 1] = NULL; // We can't free the array with a function pointer on it