Changeset 631 for branches

Timestamp:

01/03/13 21:35:20 (3 years ago)

Author:

mmckerns

Message:

merge energy_history with stepmonitor;
converted CONTINUE in PowellDirectionalSolver? to while-else termination

Location:

branches/decorate

Files:

• constraints.py (modified) (2 diffs)
• restarts.py (modified) (1 diff)

branches/decorate/constraints.py

@@ -1 +1 @@
 #!/usr/bin/env python
-
-# XXX: provide the below from measures, which from bounded?, and ...generic?
-# XXX: with_*** is a 'wrap' constraint, what about 'nested' constraints?
 
 from mystic.math.measures import *
@@ -86 +83 @@
 
 
+# XXX: provide the below from measures, which from bounded?, and ...generic?
 '''
 mean(samples, weights=None)

branches/decorate/restarts.py

@@ -43 +43 @@
         solver._init_popEnergy  = inf
         solver.popEnergy = [solver._init_popEnergy] * solver.nPop
-        solver.energy_history = []
+       #solver.energy_history = []
 
         # individual solver __init__