Changeset 793

Timestamp:

06/11/15 08:27:52 (11 months ago)

Author:

mmckerns

Message:

add scale to wrap_function, enable wrap_function in diffev2 and ensemble

Location:

mystic/mystic

Files:

• differential_evolution.py (modified) (1 diff)
• ensemble.py (modified) (2 diffs)
• tools.py (modified) (2 diffs)

mystic/mystic/differential_evolution.py

@@ -378 +378 @@
         from python_map import python_map
         if self._map != python_map:
-            pass #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
-        else: fcalls, cost = wrap_function(cost, ExtraArgs, self._evalmon)
+            #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
+            from mystic.monitors import Null
+            evalmon = Null()
+        else: evalmon = self._evalmon
+        fcalls, cost = wrap_function(cost, ExtraArgs, evalmon)
         if self._useStrictRange:
             for i in range(self.nPop):

mystic/mystic/ensemble.py

@@ -95 +95 @@
         from python_map import python_map
         if self._map != python_map:
-            pass #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
-        else: fcalls, cost = wrap_function(cost, ExtraArgs, self._evalmon)
+            #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
+            from mystic.monitors import Null
+            evalmon = Null()
+        else: evalmon = self._evalmon
+        fcalls, cost = wrap_function(cost, ExtraArgs, evalmon)
 
         # set up signal handler
@@ -289 +292 @@
         from python_map import python_map
         if self._map != python_map:
-            pass #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
-        else: fcalls, cost = wrap_function(cost, ExtraArgs, self._evalmon)
+            #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'
+            from mystic.monitors import Null
+            evalmon = Null()
+        else: evalmon = self._evalmon
+        fcalls, cost = wrap_function(cost, ExtraArgs, evalmon)
 
         # set up signal handler

mystic/mystic/tools.py

@@ -329 +329 @@
 
 # slight break to backward compatability: renamed 'args' to 'extra_args'
-def wrap_function(the_function, extra_args, EvaluationMonitor):
+def wrap_function(the_function, extra_args, EvaluationMonitor, scale=1):
     """bind an EvaluationMonitor and evaluation counter to a function object"""
+    # scale=-1 intended to seek min(-f) == -max(f)
     ncalls = [0]
     from numpy import array
@@ -337 +338 @@
         fval = the_function(x, *extra_args)
         EvaluationMonitor(x, fval)
-        return fval
+        return scale*fval
     return ncalls, function_wrapper