Changeset 791 for mystic/tests/test_solver_sanity.py

Timestamp:

06/10/15 09:03:56 (11 months ago)

Author:

mmckerns

Message:

use len(stepmon) more uniformly; fix _fcalls for DESolvers;
generations counted from stepmon, except in Powell where is overridden;
fix energy_history and solution_history for ensemble solvers;
add _kdiv, itertype, multiply, divide, and "related" methods to tools;
enable tools.listify to handle more robust types;
enable monitor to store values that are scaled with respect to called values;
add ay, iy, ax, ix, _k, _ik madness to deal with speed in k-scaling

File:

• mystic/tests/test_solver_sanity.py (modified) (2 diffs)

mystic/tests/test_solver_sanity.py

@@ -74 +74 @@
        #if self.uselimits and self.maxiter == 0: iter=0
         # sanity check solver internals
-        self.assertTrue(solver.generations == len(solver._stepmon.y)-iter)
+        self.assertTrue(solver.generations == len(solver._stepmon._y)-iter)
         self.assertTrue(list(solver.bestSolution) == solver._stepmon.x[-1]) #XXX
         self.assertTrue(solver.bestEnergy == solver._stepmon.y[-1])
@@ -82 +82 @@
             self.assertTrue(ssow.x == solver._stepmon.x)
             self.assertTrue(ssow.y == solver._stepmon.y)
+            self.assertTrue(ssow._y == solver._stepmon._y)
         if self.useevalmon:
-            self.assertTrue(solver.evaluations == len(solver._evalmon.y))
+            self.assertTrue(solver.evaluations == len(solver._evalmon._y))
             self.assertTrue(esow.x == solver._evalmon.x)
             self.assertTrue(esow.y == solver._evalmon.y)
+            self.assertTrue(esow._y == solver._evalmon._y)
 
         # Fail appropriately for solver/termination mismatch