Changeset 759

Timestamp:

10/04/14 18:03:39 (20 months ago)

Author:

mmckerns

Message:

rollback: apparently wrap_nested imposes constraints poorly

File:

• mystic/mystic/differential_evolution.py (modified) (2 diffs)

mystic/mystic/differential_evolution.py

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