Changeset 227

Timestamp:

05/13/10 16:09:30 (6 years ago)

Author:

mmckerns

Message:

allow "SetMapper?" to set the map function and the map strategy

File:

• mystic/mystic/abstract_map_solver.py (modified) (3 diffs)

mystic/mystic/abstract_map_solver.py

@@ -37 +37 @@
     >>> from pyina.launchers import mpirun_launcher
     >>> from pyina.mappers import equalportion_mapper
+    >>> from pyina.ez_map import ez_map
     >>> NNODES = 4
     >>>
@@ -43 +44 @@
     >>> solver = NelderMeadSimplexMapSolver(len(x0))
     >>> solver.SetInitialPoints(x0)            #FIXME: use batchgrid w/ bounds
-    >>> solver.SetMapStrategy(equalportion_mapper)
+    >>> solver.SetMapper(ez_map, equalportion_mapper)
     >>> solver.SetLauncher(mpirun_launcher, NNODES)
     >>> solver.Solve(rosen, CRT(), StepMonitor=stepmon)
@@ -150 +151 @@
 #       return
 
-    def SetMapper(self, strategy): #XXX: should use strategy+format ?
-        """Set the mapping strategy.
-
-Description:
-
+    def SetMapper(self, map, strategy=None): #XXX: use strategy+format ?
+        """Set the map function and the mapping strategy.
+
+Description:
+
+    Sets a mapping function to perform the map-reduce algorithm.
     Uses a mapping strategy to provide the algorithm for distributing
     the work list of optimization jobs across available resources.
 
 Inputs:
-    mapper -- mapper function (see pyina.mappers)  [DEFAULT: carddealer_mapper]
-        """
-        #XXX: allow python's 'map' to be passed
-        self._mapper = strategy
+    map -- the mapping function [DEFAULT: python_map]
+    strategy -- map strategy (see pyina.mappers) [DEFAULT: carddealer_mapper]
+        """
+        self._map = map
+        if strategy:
+          self._mapper = strategy
         #FIXME: not a true mapping function... just a dummy interface to a str
         # a real mapper has map(func,*args) interface... this expects map().