Changeset 631 for branches


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/decorate/constraints.py

    r610 r631  
    11#!/usr/bin/env python 
    2  
    3 # XXX: provide the below from measures, which from bounded?, and ...generic? 
    4 # XXX: with_*** is a 'wrap' constraint, what about 'nested' constraints? 
    52 
    63from mystic.math.measures import * 
    … …  
    8683 
    8784 
     85# XXX: provide the below from measures, which from bounded?, and ...generic? 
    8886''' 
    8987mean(samples, weights=None) 

  • branches/decorate/restarts.py

    r608 r631  
    4343        solver._init_popEnergy  = inf 
    4444        solver.popEnergy = [solver._init_popEnergy] * solver.nPop 
    45         solver.energy_history = [] 
     45       #solver.energy_history = [] 
    4646 
    4747        # individual solver __init__ 
Note: See TracChangeset for help on using the changeset viewer.