Changeset 795 for mystic

Timestamp:

06/15/15 05:24:13 (11 months ago)

Author:

mmckerns

Message:

fix: Finalize for fmin_powell should call cost unless solver is live

Location:

mystic/mystic

Files:

• abstract_solver.py (modified) (2 diffs)
• differential_evolution.py (modified) (1 diff)
• scipy_optimize.py (modified) (3 diffs)

mystic/mystic/abstract_solver.py

@@ -112 +112 @@
         """
         NP = kwds['npop'] if 'npop' in kwds else 1
-       #self._max = kwds['max'] if 'max' in kwds else False
 
         self.nDim             = dim
@@ -653 +652 @@
         # check if need to 'wrap' or can return the stored cost
         if cost in [None, _raw, _cost] and ExtraArgs in [None, _args] \
-          and self._live:
+           and self._live:
             return _cost
         # 'wrap' the 'new' cost function with _decorate

mystic/mystic/differential_evolution.py

@@ -730 +730 @@
     if handler: solver.enable_signal_handler()
     #TODO: allow sigint_callbacks for all minimal interfaces ?
-    solver.Solve(cost,termination=termination,strategy=strategy,\
+    solver.Solve(cost, termination=termination, strategy=strategy, \
                 #sigint_callback=other_callback,\
-                 CrossProbability=cross,ScalingFactor=scale,\
-                 ExtraArgs=args,callback=callback)
+                 CrossProbability=cross, ScalingFactor=scale, \
+                 ExtraArgs=args, callback=callback)
     solution = solver.Solution()
 

mystic/mystic/scipy_optimize.py

@@ -416 +416 @@
 
     if handler: solver.enable_signal_handler()
-    solver.Solve(cost,termination=termination,\
+    solver.Solve(cost, termination=termination, \
                  disp=disp, ExtraArgs=args, callback=callback)
     solution = solver.Solution()
@@ -605 +605 @@
     def Finalize(self, **kwds):
         """cleanup upon exiting the main optimization loop"""
-        if self.energy_history != None:
+        if self.energy_history and self._live:
             self.energy_history = None # resync with 'best' energy
             self._stepmon(self.bestSolution, self.bestEnergy, self.id)
@@ -757 +757 @@
 
     if handler: solver.enable_signal_handler()
-    solver.Solve(cost,termination=termination,\
+    solver.Solve(cost, termination=termination, \
                  xtol=xtol, ExtraArgs=args, callback=callback, \
                  disp=disp, direc=direc)   #XXX: last two lines use **kwds