Changeset 231

Timestamp:

05/15/10 00:56:08 (6 years ago)

Author:

mmckerns

Message:

merged pp version of DESolver from ppmystic, and examples

Location:

mystic

Files:

• examples/TEST_ffitPP.py (copied) (copied from branches/pp/examples/TEST_ffitPP.py) (1 diff)
• examples/TEST_ffitPP2.py (copied) (copied from branches/pp/examples/TEST_ffitPP2.py)
• examples/TEST_ffitPP2_b.py (copied) (copied from branches/pp/examples/TEST_ffitPP2_b.py)
• examples/TEST_ffitPP_b.py (copied) (copied from branches/pp/examples/TEST_ffitPP_b.py) (3 diffs)
• mystic/abstract_map_solver.py (modified) (2 diffs)
• mystic/differential_evolution.py (modified) (4 diffs)

mystic/examples/TEST_ffitPP.py

@@ -15 +15 @@
 
 def main():
-    from mystic.differential_evolution import PPDESolver as DifferentialEvolutionSolver
+    from mystic.differential_evolution import DifferentialEvolutionSolver2
+    from pyina.pp_map import pp_map
 
-    solver = DifferentialEvolutionSolver(ND, NP)
+    solver = DifferentialEvolutionSolver2(ND, NP)
+    solver.SetMapper(pp_map)
     solver.SetRandomInitialPoints(min = [-100.0]*ND, max = [100.0]*ND)
     solver.SetEvaluationLimits(maxiter=MAX_GENERATIONS)

mystic/examples/TEST_ffitPP_b.py

@@ -42 +42 @@
 
 def main(servers,ncpus):
-    from mystic.differential_evolution import PPDESolver as DifferentialEvolutionSolver
+    from mystic.differential_evolution import DifferentialEvolutionSolver2
+    from pyina.pp_map import pp_map
 
-    solver = DifferentialEvolutionSolver(ND, NP)
+    solver = DifferentialEvolutionSolver2(ND, NP)
+    solver.SetMapper(pp_map)
     solver.SetRandomInitialPoints(min = [-100.0]*ND, max = [100.0]*ND)
     solver.SetEvaluationLimits(maxiter=MAX_GENERATIONS)
@@ -52 +54 @@
     #strategy = Best1Bin
 
-    solver.SelectComputeServers(servers,ncpus)
+    solver.SelectServers(servers,ncpus)
     solver.Solve(ChebyshevCost, termination=VTR(0.01), strategy=strategy, \
                  CrossProbability=1.0, ScalingFactor=0.9 , \
@@ -65 +67 @@
 
     # number of local processors
-    ncpus = None #XXX: None -> autodetect; otherwise select n=0,1,2,...
+    ncpus = 'autodetect' #XXX: None == autodetect; otherwise select n=0,1,2,...
 
     import sys

mystic/mystic/abstract_map_solver.py

@@ -120 +120 @@
         self._queue           = defaults['queue'] # scheduler_queue
         self._timelimit       = defaults['timelimit']
-        self._servers         = ('*',)            # hostname:port
-        self._ncpus           = None
+        self._servers         = ('*',) #<detect>  # hostname:port
+        self._ncpus           = None   #<detect>  # local processors
+       #self._servers         = ()     #<None>    # hostname:port
+       #self._ncpus           = 0      #<None>    # local processors
         return
 
@@ -133 +135 @@
 
     If ncpus=None, then 'autodetect'; or if ncpus=0, then 'no local'.
-    If servers=('*',), then 'autodetect'.
+    If servers=('*',), then 'autodetect'; or if servers=(), then 'no remote'.
 
 Inputs:

mystic/mystic/differential_evolution.py

@@ -434 +434 @@
         #-------------------------------------------------------------
 
-        # 'map' is read from self._map  #FIXME: delete this line
-
         import signal
         self._EARLYEXIT = False
 
+       #FIXME: EvaluationMonitor fails for MPI, throws error for 'pp'?
        #fcalls = [0] #FIXME: temporary patch for removing the following line
         fcalls, costfunction = wrap_function(costfunction, ExtraArgs, EvaluationMonitor)
@@ -467 +466 @@
         mapconfig = dict(nnodes=self._nnodes, launcher=self._launcher, \
                          mapper=self._mapper, queue=self._queue, \
-                         timelimit=self._timelimit)
+                         timelimit=self._timelimit, \
+                         ncpus=self._ncpus, servers=self._servers)
         trialEnergy = self._map(costfunction, trialPop, **mapconfig)
 
@@ -483 +483 @@
                         
         self.energy_history.append(self.bestEnergy)
+       #FIXME: StepMonitor throws error for 'pp'?
         StepMonitor(self.bestSolution[:], self.bestEnergy)
         self.generations = 0  #XXX: above currently *not* counted as an iteration
@@ -524 +525 @@
                             
             self.energy_history.append(self.bestEnergy)
+           #FIXME: StepMonitor throws error for 'pp'?
             StepMonitor(self.bestSolution[:], self.bestEnergy)
             self.generations += 1