Changeset 764 for mystic

Timestamp:

10/07/14 19:31:21 (20 months ago)

Author:

mmckerns

Message:

fix: ensemble solvers serializable by pp with mild rewrite to local_optimize

File:

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

mystic/mystic/ensemble.py

@@ -138 +138 @@
         op = [copy(solver) for i in range(len(initial_values))]
        #cf = [cost for i in range(len(initial_values))]
-       #vb = [verbose for i in range(len(initial_values))]
+        vb = [verbose for i in range(len(initial_values))]
+        cb = [echo for i in range(len(initial_values))] #XXX: remove?
         id = range(len(initial_values))
 
         # generate the local_optimize function
-        def local_optimize(solver, x0, rank=None, disp=verbose, callback=echo):
+        def local_optimize(solver, x0, rank=None, disp=False, callback=None):
             solver.id = rank
             solver.SetInitialPoints(x0)
@@ -153 +154 @@
         # map:: solver = local_optimize(solver, x0, id, verbose)
         results = self._map(local_optimize, op, initial_values, id, \
-                                                **self._mapconfig)
+                                            vb, cb, **self._mapconfig)
 
         # save initial state
@@ -296 +297 @@
         op = [copy(solver) for i in range(len(initial_values))]
        #cf = [cost for i in range(len(initial_values))]
-       #vb = [verbose for i in range(len(initial_values))]
+        vb = [verbose for i in range(len(initial_values))]
+        cb = [echo for i in range(len(initial_values))] #XXX: remove?
         id = range(len(initial_values))
 
         # generate the local_optimize function
-        def local_optimize(solver, x0, rank=None, disp=verbose, callback=echo):
+        def local_optimize(solver, x0, rank=None, disp=False, callback=None):
             solver.id = rank
             solver.SetInitialPoints(x0)
@@ -311 +313 @@
         # map:: solver = local_optimize(solver, x0, id, verbose)
         results = self._map(local_optimize, op, initial_values, id, \
-                                                **self._mapconfig)
+                                            vb, cb, **self._mapconfig)
 
         # save initial state