Changeset 762

Timestamp:

10/06/14 14:39:52 (20 months ago)

Author:

mmckerns

Message:

enable disp and callback in ensemble solvers, better disp behavior for oneliners

File:

• mystic/mystic/ensemble.py (modified) (8 diffs)

mystic/mystic/ensemble.py

@@ -85 +85 @@
         # process and activate input settings
         settings = self._process_inputs(kwds)
-        disp=0
+        disp = settings.get('disp', False)
+        echo = settings.get('callback', None) #XXX: every iteration every run
 #       for key in settings:
 #           exec "%s = settings['%s']" % (key,key)
@@ -141 +142 @@
 
         # generate the local_optimize function
-        def local_optimize(solver, x0, rank=None, disp=verbose):
+        def local_optimize(solver, x0, rank=None, disp=verbose, callback=echo):
             solver.id = rank
             solver.SetInitialPoints(x0)
@@ -147 +148 @@
                 solver.SetStrictRanges(min=solver._strictMin, \
                                        max=solver._strictMax) # or lower,upper ?
-            solver.Solve(cost, disp=disp)
+            solver.Solve(cost, disp=disp, callback=callback)
             return solver
 
@@ -249 +250 @@
         # process and activate input settings
         settings = self._process_inputs(kwds)
-        disp=0
+        disp = settings.get('disp', False)
+        echo = settings.get('callback', None) #XXX: every iteration every run
 #       for key in settings:
 #           exec "%s = settings['%s']" % (key,key)
@@ -298 +300 @@
 
         # generate the local_optimize function
-        def local_optimize(solver, x0, rank=None, disp=verbose):
+        def local_optimize(solver, x0, rank=None, disp=verbose, callback=echo):
             solver.id = rank
             solver.SetInitialPoints(x0)
@@ -304 +306 @@
                 solver.SetStrictRanges(min=solver._strictMin, \
                                        max=solver._strictMax) # or lower,upper ?
-            solver.Solve(cost, disp=disp)
+            solver.Solve(cost, disp=disp, callback=callback)
             return solver
 
@@ -467 +469 @@
 
     # code below here pushes output to scipy.optimize.fmin interface
-    msg = solver.CheckTermination(disp=disp, info=True)
+    msg = solver.CheckTermination(disp=False, info=True)
 
     x = solver.bestSolution
@@ -598 +600 @@
 
     # code below here pushes output to scipy.optimize.fmin interface
-    msg = solver.CheckTermination(disp=disp, info=True)
+    msg = solver.CheckTermination(disp=False, info=True)
 
     x = solver.bestSolution