Changeset 132

Timestamp:

04/02/09 17:23:57 (7 years ago)

Author:

mmckerns

Message:

now StepMonitor? logs best not simplex (ticket #29); built new patch

Files:

• DEV_NOTES (modified) (1 diff)
• mystic/examples/example11.py (modified) (1 diff)
• mystic/mystic/scipy_optimize.py (modified) (2 diffs)
• releases/Makefile (modified) (2 diffs)
• releases/mystic-0.1a1-patch2.diff (added)

DEV_NOTES

@@ -1 +1 @@
 = THINGS TO RESOLVE =
-*/*/*py:
- - move more of "mogi" to mystic.models
-mystic/mystic/scipy_optimize.py:
- - better way to deal with direc (?)
- - can x0 versus self.population[0] be handled better? (and _clipGuess...)
 mystic/mystic/differential_evolution.py:
  - allow register of sigint_callback for all 'one-liner' interfaces (?)

mystic/examples/example11.py

@@ -40 +40 @@
 def plot_params(monitor):
     x = range(len(monitor.y))
-    import numpy
-    # NOTE: workaround poor design, where simplex is logged by StepMonitor
-    if isinstance(monitor.y[0],numpy.ndarray):
-        y = [i[0] for i in monitor.y]
-    else:
-        y = monitor.y
+    y = monitor.y
     pylab.plot(x,y,'b-')
     pylab.axis([1,0.5*x[-1],0,y[1]],'k-')

mystic/mystic/scipy_optimize.py

@@ -231 +231 @@
 
         while (fcalls[0] < self._maxfun and iterations < self._maxiter):
-            StepMonitor(sim, fsim) # get all values; "best" is sim[0]
+            StepMonitor(sim[0], fsim[0]) # sim = all values; "best" is sim[0]
             if self._EARLYEXIT or termination(self):
                 break
@@ -401 +401 @@
     allvecs = []
     for i in range(iterations):
-       #allvecs.append(list(stepmon.x[i][0]))
-        allvecs.append(stepmon.x[i][0])
+       #allvecs.append(list(stepmon.x[i]))
+        allvecs.append(stepmon.x[i])
 
     if fcalls >= solver._maxfun:

releases/Makefile

@@ -1 +1 @@
 #---------------------------------------------------
-PATCHES = 1
+PATCHES = 2
 #---------------------------------------------------
 
@@ -6 +6 @@
 
 patch:
-        patch -p0 -i mystic-0.1a1-patch1.diff
+        patch -p0 -i mystic-0.1a1-patch2.diff
 
 release:
-        tar -cvzf mystic-0.1a1-p1.tgz mystic-0.1a1
+        tar -cvzf mystic-0.1a1-p2.tgz mystic-0.1a1
 
 clean:
         cd mystic-0.1a1; cd examples; rm -f README example*; cd ..; cd ..
+        cd mystic-0.1a1; cd mystic; rm -f scipy_optimize*; cd ..; cd ..
         svn up