Changeset 787

Timestamp:

02/22/15 13:00:28 (15 months ago)

Author:

mmckerns

Message:

remove return cost from SetObjective?; enable change cost and args in Step
as a byproduct, _cost now stores both wrapped and raw cost functions

Location:

mystic/mystic

Files:

• abstract_solver.py (modified) (4 diffs)
• differential_evolution.py (modified) (4 diffs)

mystic/mystic/abstract_solver.py

@@ -80 +80 @@
 from mystic.tools import wrap_function, wrap_nested, wrap_reducer
 from mystic.tools import wrap_bounds, wrap_penalty, reduced
+from klepto import isvalid, validate
 
 abs = absolute
-
+null = lambda x: None
 
 class AbstractSolver(object):
@@ -147 +148 @@
         self._penalty         = lambda x: 0.0
         self._reducer         = None
-        self._cost            = (None, None)
+        self._cost            = (None, None, None)
+        #                       (cost, raw_cost, args) #,callback)
         self._termination     = lambda x, *ar, **kw: False if len(ar) < 1 or ar[0] is False or kw.get('info',True) == False else '' #XXX: better default ?
         # (get termination details with self._termination.__doc__)
@@ -592 +594 @@
         return
 
-    def SetObjective(self, cost, ExtraArgs=None, **kwds): # callback, fetch ?
-        """set the objective, decorated with bounds, penalties, monitors, etc"""
-        fetch = kwds.get('fetch', False)
-        cost = self._bootstrap_objective(cost, ExtraArgs)
-        return cost if fetch else None
+    def SetObjective(self, cost, ExtraArgs=None):  # callback=None/False ?
+        """decorate the cost function with bounds, penalties, monitors, etc"""
+        self._bootstrap_objective(cost, ExtraArgs) # callback=null (see above)
+        return
 
     def _decorate_objective(self, cost, ExtraArgs=None):
-        """decorate cost function with bounds, penalties, monitors, etc"""
+        """decorate the cost function with bounds, penalties, monitors, etc"""
+        raw = cost
         if ExtraArgs is None: ExtraArgs = ()
         self._fcalls, cost = wrap_function(cost, ExtraArgs, self._evalmon)
@@ -611 +613 @@
            #cost = reduced(*self._reducer)(cost) # was self._reducer = (f,bool)
             cost = reduced(self._reducer, arraylike=True)(cost)
-        # hold on to the 'wrapped' cost function
-        self._cost = (cost, ExtraArgs)
+        # hold on to the 'wrapped' and 'raw' cost function
+        self._cost = (cost, raw, ExtraArgs)
         return cost
 
     def _bootstrap_objective(self, cost=None, ExtraArgs=None):
         """HACK to enable not explicitly calling _decorate_objective"""
-        args = None
-        if cost is None: # 'use existing cost'
-            cost,args = self._cost # use args, unless override with ExtraArgs
-        if ExtraArgs is not None: args = ExtraArgs
-        if self._cost[0] is None: # '_decorate_objective not yet called'
-            if args is None: args = ()
-            cost = self._decorate_objective(cost, args)
-        return cost
+        _cost,_raw,_args = self._cost
+        # check if need to 'wrap' or can return the stored cost
+        if cost in [None, _raw, _cost] and ExtraArgs in [None, _args]:
+            return _cost
+        # get cost and args if None was given
+        if cost is None: cost = _raw
+        args = _args if ExtraArgs is None else ExtraArgs
+        args = () if args is None else args
+        # quick validation check (so doesn't screw up internals)
+        if not isvalid(cost, [0]*self.nDim, *args):
+            try: name = cost.__name__
+            except AttributeError: # raise new error for non-callables
+                cost(*args)
+            validate(cost, None, *args)
+           #val = len(args) + 1  #XXX: 'klepto.validate' for better error?
+           #msg = '%s() invalid number of arguments (%d given)' % (name, val)
+           #raise TypeError(msg)
+        # 'wrap' the 'new' cost function with _decorate
+        return self._decorate_objective(cost, args)
+        #XXX: **CAUTION** when _decorate called, solver._fcalls will be reset
 
     def _Step(self, cost=None, ExtraArgs=None, **kwds):

mystic/mystic/differential_evolution.py

@@ -203 +203 @@
     def _decorate_objective(self, cost, ExtraArgs=None):
         """decorate cost function with bounds, penalties, monitors, etc"""
+        raw = cost
         if ExtraArgs is None: ExtraArgs = ()
         self._fcalls, cost = wrap_function(cost, ExtraArgs, self._evalmon)
@@ -213 +214 @@
            #cost = reduced(*self._reducer)(cost) # was self._reducer = (f,bool)
             cost = reduced(self._reducer, arraylike=True)(cost)
-        # hold on to the 'wrapped' cost function
-        self._cost = (cost, ExtraArgs)
+        # hold on to the 'wrapped' and 'raw' cost function
+        self._cost = (cost, raw, ExtraArgs)
         return cost
 
@@ -371 +372 @@
     def _decorate_objective(self, cost, ExtraArgs=None):
         """decorate cost function with bounds, penalties, monitors, etc"""
+        raw = cost
         if ExtraArgs is None: ExtraArgs = ()
        #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
@@ -386 +388 @@
            #cost = reduced(*self._reducer)(cost) # was self._reducer = (f,bool)
             cost = reduced(self._reducer, arraylike=True)(cost)
-        # hold on to the 'wrapped' cost function
-        self._cost = (cost, ExtraArgs)
+        # hold on to the 'wrapped' and 'raw' cost function
+        self._cost = (cost, raw, ExtraArgs)
         return cost