Changeset 239

Timestamp:

05/16/10 22:02:03 (6 years ago)

Author:

mmckerns

Message:

bugfixes for termination conditions (ticket #76); added beginnings of test scripts for termination conditions

Files:

• branches/alta/mystic-0.1a2/examples/testsolvers (deleted)
• mystic/mystic/termination.py (modified) (3 diffs)
• mystic/tests/chebyshevinputs.py (copied) (copied from branches/alta/mystic-0.1a2/examples/testsolvers/chebyshevinputs.py) (1 diff)
• mystic/tests/chebyshevinputs_de.py (copied) (copied from branches/alta/mystic-0.1a2/examples/testsolvers/chebyshevinputs_de.py) (1 diff)
• mystic/tests/roseninputs.py (copied) (copied from branches/alta/mystic-0.1a2/examples/testsolvers/roseninputs.py) (1 diff)
• mystic/tests/testsolvers_pyre.py (copied) (copied from branches/alta/mystic-0.1a2/examples/testsolvers/testsolvers_pyre.py)

mystic/mystic/termination.py

@@ -29 +29 @@
          hist = inst.energy_history
          lg = len(hist)
-         return lg > generations and (hist[-generations]-hist[-1]) < tolerance
+         if lg <= generations: return False
+         return (hist[-generations]-hist[-1]) < tolerance
     return _ChangeOverGeneration
 
-def NormalizedChangeOverGeneration(tolerance = 1e-4, generations = 2):
+def NormalizedChangeOverGeneration(tolerance = 1e-4, generations = 10):
     """normalized change in cost is < tolerance over number of generations:
 
@@ -40 +41 @@
          hist = inst.energy_history
          lg = len(hist)
+         if lg <= generations: return False
          diff = tolerance*(abs(hist[-generations])+abs(hist[-1])) + eta
-         return lg > generations and 2.0*(hist[-generations]-hist[-1]) <= diff
+         return 2.0*(hist[-generations]-hist[-1]) <= diff
     return _NormalizedChangeOverGeneration
               
@@ -48 +50 @@
 
 abs(xi-x0) <= xtol & abs(fi-f0) <= ftol, where x=params & f=cost"""
+    #NOTE: this termination expects nPop > 1
     def _CandidateRelativeTolerance(inst):
-         sim = inst.population
-         fsim = inst.popEnergy
+         sim = numpy.array(inst.population)
+         fsim = numpy.array(inst.popEnergy)
+         if not len(fsim[1:]):
+             print "Warning: Invalid termination condition (nPop < 2)"
+             return True
+         #   raise ValueError, "Invalid termination condition (nPop < 2)"
          #FIXME: abs(inf - inf) will raise a warning...
          errdict = numpy.seterr(invalid='ignore') #FIXME: turn off warning 
-         answer = (max(numpy.ravel(abs(sim[1:]-sim[0]))) <= xtol \
-                  and max(abs(fsim[0]-fsim[1:])) <= ftol)
+         answer = max(numpy.ravel(abs(sim[1:]-sim[0]))) <= xtol
+         answer = answer and max(abs(fsim[0]-fsim[1:])) <= ftol
          numpy.seterr(invalid=errdict['invalid']) #FIXME: turn on warnings
          return answer

mystic/tests/chebyshevinputs.py

@@ -31 +31 @@
 max_bounds = [200, 1,   0, 1,200, 1,   0, inf, inf]
 
-#termination = CandidateRelativeTolerance()
+termination = CandidateRelativeTolerance()
 #termination = VTR()
 #termination = ChangeOverGeneration()
-termination = NormalizedChangeOverGeneration()
+#termination = NormalizedChangeOverGeneration()
 
 # End of file

mystic/tests/chebyshevinputs_de.py

@@ -39 +39 @@
 
 #termination = VTR()
-#termination = CandidateRelativeTolerance()
+termination = CandidateRelativeTolerance()
 #termination = ChangeOverGeneration()
-termination = NormalizedChangeOverGeneration()
+#termination = NormalizedChangeOverGeneration()
 
 

mystic/tests/roseninputs.py

@@ -31 +31 @@
 #max_bounds = [200.001, 100.001, inf]    
 
-#termination = CandidateRelativeTolerance()
+termination = CandidateRelativeTolerance()
 #termination = VTR()
-termination = ChangeOverGeneration()
+#termination = ChangeOverGeneration()
 #termination = NormalizedChangeOverGeneration()