Changeset 158

Timestamp:

08/02/09 14:40:15 (7 years ago)

Author:

altafang

Message:

Adding simulated annealing solver andsome fixes to snobfit

Location:

branches/alta/mystic-0.1a2

Files:

• examples/test_anneal.py (added)
• mystic/anneal_solver.py (added)
• mystic/snobfit_solver.py (modified) (3 diffs)
• mystic/termination.py (modified) (1 diff)

branches/alta/mystic-0.1a2/mystic/snobfit_solver.py

@@ -1 @@
-# Snobfit optimization (branch and bound) adapted to the Mystic framework
-
 """
 Solvers
@@ -68 +66 @@
 from mystic.softConstraint import SoftConstraint, SoftConstraints
 
-# -----------------------------------------------------------------
-
-# Mystic imports
+# Import Mystic tools
 from mystic.tools import Null, wrap_function, unpair
 from mystic.tools import wrap_bounds
@@ -264 +260 @@
         # code below here pushes output to scipy.optimize interface
         fval = self.bestEnergy
-        warnflag = 0
 
         if fcalls[0] >= self._maxfun:
-            warnflag = 1
             if disp:
                 print "Warning: Maximum number of function evaluations has "\
                       "been exceeded."
         elif i >= self._maxiter:
-            warnflag = 2
             if disp:
                 print "Warning: Maximum number of iterations has been exceeded"

branches/alta/mystic-0.1a2/mystic/termination.py

@@ -85 +85 @@
     return _
 
+def AnnealTermination(feps=1e-6):
+    """Terminate if abs((population-x0)/x0) < feps"""
+    def _(inst):
+         sim = inst.population
+         return all(abs((sim-sim[0])/sim[0]) < feps)
+    return _
+
 # end of file