Changeset 698

Timestamp:

07/08/13 15:15:46 (3 years ago)

Author:

mmckerns

Message:

fix: Solve does not recompute when Step has been already called

Location:

mystic/mystic

Files:

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

mystic/mystic/abstract_solver.py

@@ -604 +604 @@
         return settings
 
-    def Solve(self, cost, termination=None, sigint_callback=None,
-                                            ExtraArgs=(), **kwds):
+    def Solve(self, cost=None, termination=None, sigint_callback=None,
+                                                 ExtraArgs=None, **kwds):
         """Minimize a 'cost' function with given termination conditions.
 
@@ -629 +629 @@
         the current parameter vector.  [default = None]
     disp -- non-zero to print convergence messages.
-        """ #FIXME: edit so "Solve" can be called anytime to "finish" the solve
-        #FIXME: needs to respect when evals/iters have been done already
+        """
+        # HACK to enable not explicitly calling _RegisterObjective
+        cost = self._bootstrap_decorate(cost, ExtraArgs)
         # process and activate input settings
         settings = self._process_inputs(kwds)
@@ -642 +643 @@
         if self._handle_sigint: signal.signal(signal.SIGINT, self.signal_handler)
 
-        # decorate cost function with bounds, penalties, monitors, etc
-        self._RegisterObjective(cost, ExtraArgs)    #XXX: SetObjective ?
+       ## decorate cost function with bounds, penalties, monitors, etc
+       #self._RegisterObjective(cost, ExtraArgs)    #XXX: SetObjective ?
         # register termination function
         if termination is not None:
@@ -649 +650 @@
 
         # the initital optimization iteration
-        self.Step()
-        if callback is not None:
-            callback(self.bestSolution)
+        if not len(self._stepmon): # do generation = 0
+            self.Step()
+            if callback is not None:
+                callback(self.bestSolution)
          
-        # initialize termination conditions, if needed
-        self._termination(self)
+            # initialize termination conditions, if needed
+            self._termination(self) #XXX: call at generation 0 or always?
         # impose the evaluation limits
         self._SetEvaluationLimits()

mystic/mystic/differential_evolution.py

@@ -264 +264 @@
         return settings
 
-    def Solve(self, cost, termination=None, sigint_callback=None,
-                                            ExtraArgs=(), **kwds):
+    def Solve(self, cost=None, termination=None, sigint_callback=None,
+                                                 ExtraArgs=None, **kwds):
         """Minimize a function using differential evolution.
 
@@ -411 +411 @@
         return settings
 
-    def Solve(self, cost, termination=None, sigint_callback=None,
-                                            ExtraArgs=(), **kwds):
+    def Solve(self, cost=None, termination=None, sigint_callback=None,
+                                                 ExtraArgs=None, **kwds):
         """Minimize a function using differential evolution.
 

mystic/mystic/nested.py

@@ -53 +53 @@
 #       return
 
+    #FIXME: should take cost=None, ExtraArgs=None... and utilize Step
     def Solve(self, cost, termination=None, sigint_callback=None,
                                             ExtraArgs=(), **kwds):

mystic/mystic/scipy_optimize.py

@@ -255 +255 @@
         return settings
 
-    def Solve(self, cost, termination=None, sigint_callback=None,
-                                            ExtraArgs=(), **kwds):
+    def Solve(self, cost=None, termination=None, sigint_callback=None,
+                                                 ExtraArgs=None, **kwds):
         """Minimize a function using the downhill simplex algorithm.
 
@@ -569 +569 @@
         return settings
 
-    def Solve(self, cost, termination=None, sigint_callback=None,
-                                            ExtraArgs=(), **kwds):
+    def Solve(self, cost=None, termination=None, sigint_callback=None,
+                                                 ExtraArgs=None, **kwds):
         """Minimize a function using modified Powell's method.