Changeset 734

Timestamp:

07/28/14 18:08:15 (22 months ago)

Author:

mmckerns

Message:

mv solver_test_compare and solver_test_sanity to start with test_*;
run all included tests; assert silently; include function to trap_stdout

Location:

mystic

Files:

• mystic/termination.py (modified) (1 diff)
• tests/test_solver_compare.py (moved) (moved from mystic/tests/solver_test_compare.py) (5 diffs)
• tests/test_solver_sanity.py (moved) (moved from mystic/tests/solver_test_sanity.py) (6 diffs)

mystic/mystic/termination.py

@@ -291 +291 @@
         sim = numpy.array(inst.population)
         #if not len(sim[1:]):
-        #    print "Warning: Invalid termination condition (nPop < 2)"
-        #    return True
+        #    warn = "Warning: Invalid termination condition (nPop < 2)"
+        #    print warn
+        #    return warn
         if numpy.all(abs(sim - sim[0]) <= abs(tolerance * sim[0])): return info(doc)
         return info(null)

mystic/tests/test_solver_compare.py

@@ -9 +9 @@
 try:
   from scipy.optimize import fmin, fmin_powell
-  scipy_solvers = ['fmin_powell', 'fmin']
 except ImportError:
-  print "Warning: scipy not installed; comparison tests skipped"
-  scipy_solvers = []
+  from mystic._scipyoptimize import fmin, fmin_powell
+# print "Warning: scipy not installed; defaulting to local solver copy"
+scipy_solvers = ['fmin_powell', 'fmin']
 
 import mystic.solvers as solvers
@@ -56 +56 @@
 # print 'my:', my_x[0:2]
 # print 'sp:', sp_x[0:2]
-  if maxiter != 0: # mystic can stop at iter=0, scipy can't
+  if my_x[3] == sp_x[-2]: # mystic can stop at iter=0, scipy can't
     assert almostEqual(my_x[0], sp_x[0])
     assert almostEqual(my_x[1], sp_x[1])
@@ -76 +76 @@
 
   # check solutions versus results based on the random_seed
-  print "comparing against known results"
+# print "comparing against known results"
   sol = solvers.diffev(rosen, x0, npop=40, disp=0, full_output=True)
   assert almostEqual(sol[1], 0.0020640145337293249, tol=3e-3)
@@ -88 +88 @@
   solver2 = 'diffev2'
   for solver in ['diffev']:
-    print "comparing %s and %s from mystic" % (solver, solver2)
+#   print "comparing %s and %s from mystic" % (solver, solver2)
     test_solvers(solver, solver2, x0, npop=40)
-#   test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=0)
-#   test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=1)
-#   test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=2)
-#   test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=9)
+    test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=0)
+    test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=1)
+    test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=2)
+    test_solvers(solver, solver2, x0, npop=40, maxiter=None, maxfun=9)
     test_solvers(solver, solver2, x0, npop=40, maxiter=0)
     test_solvers(solver, solver2, x0, npop=40, maxiter=1)
@@ -100 +100 @@
 
   for solver in scipy_solvers:
-    print "comparing %s from mystic and scipy" % (solver)
+#   print "comparing %s from mystic and scipy" % (solver)
     test_compare(solver, x0)
-#   test_compare(solver, x0, maxiter=None, maxfun=0)
-#   test_compare(solver, x0, maxiter=None, maxfun=1)
-#   test_compare(solver, x0, maxiter=None, maxfun=2)
-#   test_compare(solver, x0, maxiter=None, maxfun=9)
+    test_compare(solver, x0, maxiter=None, maxfun=0)
+    test_compare(solver, x0, maxiter=None, maxfun=1)
+    test_compare(solver, x0, maxiter=None, maxfun=2)
+    test_compare(solver, x0, maxiter=None, maxfun=9)
     test_compare(solver, x0, maxiter=0)
     test_compare(solver, x0, maxiter=1)

mystic/tests/test_solver_sanity.py

@@ -9 +9 @@
 # should report clock-time, # of iterations, and # of function evaluations
 
+import sys
+from StringIO import StringIO
 import unittest
 from math import *
 from mystic.math import almostEqual
+
+def trap_stdout(): #XXX: better with contextmanager?
+    "temporarily trap stdout; return original sys.stdout"
+    orig, sys.stdout = sys.stdout, StringIO()
+    return orig
+
+def release_stdout(orig):
+    "release stdout; return any trapped output as a string"
+    out = sys.stdout.getvalue()
+    sys.stdout.close()
+    sys.stdout = orig
+    return out
+
 
 class TestRosenbrock(unittest.TestCase):
@@ -36 +51 @@
         import numpy
         from mystic.tools import random_seed
-        random_seed(321)
+        seed = 111 if self.maxiter is None else 321 #XXX: good numbers...
+        random_seed(seed)
         esow = Monitor()
         ssow = Monitor() 
@@ -46 +62 @@
         if self.useevalmon: solver.SetEvaluationMonitor(esow)
         if self.usestepmon: solver.SetGenerationMonitor(ssow)
+        #### run solver, but trap output
+        _stdout = trap_stdout()
         solver.Solve(self.costfunction, self.term, **kwds)
+        out = release_stdout(_stdout)
+        ################################
         sol = solver.Solution()
 
@@ -68 +88 @@
         if early_terminate:
             self.assertTrue(solver.generations < 2)
+            warn = "Warning: Invalid termination condition (nPop < 2)"
+            self.assertTrue(warn in out)
             return
 
@@ -104 +126 @@
 
         # Verify solution is close to exact
-        print sol
+       #print sol
         for i in range(len(sol)):
             self.assertAlmostEqual(sol[i], self.exact[i], self.precision)
@@ -232 +254 @@
     suite1 = unittest.TestLoader().loadTestsFromTestCase(TestRosenbrock)
     allsuites = unittest.TestSuite([suite1])
+#   runner = unittest.TextTestRunner(verbosity=2)
+    runner = unittest.TextTestRunner()
+
     my_maxiter = 0
-#   my_maxiter = 1
-#   my_maxiter = 2
-#   my_maxiter = None
-    unittest.TextTestRunner(verbosity=2).run(allsuites)
+    runner.run(allsuites)
+    my_maxiter = 1
+    runner.run(allsuites)
+    my_maxiter = 2
+    runner.run(allsuites)
+    my_maxiter = None
+    runner.run(allsuites)
+
 
 # EOF