Changeset 638 for branches

Timestamp:

01/07/13 23:23:35 (3 years ago)

Author:

mmckerns

Message:

fix: updated sumt penalty restarts for changes to solver internals;
fix: don't use self.generations in the solver step method;
scipy_optimize.fmin now is single-step iterable;
_setSimplexWithinRangeBoundary gets x0 directly from self.population

File:

• branches/decorate/restarts.py (modified) (2 diffs)

branches/decorate/restarts.py

@@ -37 +37 @@
         # 'Clear' some of the attributes of the solver
         solver.population = [[0.0 for i in range(solver.nDim)] for j in range(solver.nPop)]
-        solver.generations = 0
-        solver.bestEnergy = 0.0
-        solver.bestSolution = [0.0] * solver.nDim
+       #solver.generations = 0
+        solver.bestEnergy = None
+        solver.bestSolution = None
         solver.trialSolution = [0.0] * solver.nDim
-        solver._init_popEnergy  = inf
         solver.popEnergy = [solver._init_popEnergy] * solver.nPop
        #solver.energy_history = []
@@ -119 +118 @@
     # Return the last solver, which contains all of the important information
     # First modify the solver to include total data.
-    solver.generations = total_iterations
-    solver.energy_history = total_energy_history
+   #solver.generations = total_iterations
+   #solver.energy_history = total_energy_history
 
     #XXX solver.bestEnergy is not exactly cost(solver.bestSolution),