Changeset 758

Timestamp:

10/04/14 13:08:55 (20 months ago)

Author:

mmckerns

Message:

diffev2 uses wrap_nested to apply constraints and evaluate cost in parallel

Location:

mystic/mystic

Files:

• differential_evolution.py (modified) (2 diffs)
• scipy_optimize.py (modified) (4 diffs)

mystic/mystic/differential_evolution.py

@@ -146 +146 @@
 
 from mystic.tools import wrap_function, unpair, isiterable
-from mystic.tools import wrap_bounds, wrap_penalty, reduced
+from mystic.tools import wrap_bounds, wrap_penalty, wrap_nested, reduced
 
 from mystic.abstract_solver import AbstractSolver
@@ -388 +388 @@
                 strategy(self, candidate)
             # apply constraints
-            self.trialSolution[candidate][:] = self._constraints(self.trialSolution[candidate])
+           #self.trialSolution[candidate][:] = self._constraints(self.trialSolution[candidate])
+        # bind constraints to cost
+        concost = wrap_nested(cost, self._constraints)
 
         # apply penalty
        #trialEnergy = map(self._penalty, self.trialSolution)#,**self._mapconfig)
         # calculate cost
-        trialEnergy = self._map(cost, self.trialSolution, **self._mapconfig)
+        trialEnergy = self._map(concost, self.trialSolution, **self._mapconfig)
 
         # each trialEnergy should be a scalar

mystic/mystic/scipy_optimize.py

@@ -182 +182 @@
                 y[k] = val[k]
                 sim[k+1] = y
-                f = cost(y)
+                f = cost(y) #XXX: use self._map?
                 fsim[k+1] = f
 
@@ -238 +238 @@
                         for j in one2np1:
                             sim[j] = sim[0] + sigma*(sim[j] - sim[0])
-                            fsim[j] = cost(sim[j])
+                            fsim[j] = cost(sim[j]) #XXX: use self._map?
 
         if len(self._stepmon):
@@ -502 +502 @@
 
                 # apply constraints
-                x = asfarray(self._constraints(x))
+                x = asfarray(self._constraints(x)) #XXX: use self._map?
             # decouple from 'best' energy
             self.energy_history = self.energy_history + [fval]
@@ -547 +547 @@
 
                 # apply constraints
-                x = asfarray(self._constraints(x))
+                x = asfarray(self._constraints(x)) #XXX: use self._map?
 
             # decouple from 'best' energy