updated tests

nifty/minimization/descent_minimizer.py

@@ -164,6 +164,7 @@ class DescentMinimizer(Loggable, object):
                 new_energy = energy.at( position=energy.position + 
                     np.random.rand()/10*(new_energy.position-energy.position) )
                 energy = new_energy
+                convergence = self.convergence_level + 2
                 break
 
             energy = new_energy

test/test_minimization/test_conjugate_gradient.py

 
 import unittest
 
-from numpy.testing import assert_approx_equal, assert_equal
+from numpy.testing import assert_equal, assert_almost_equal
 
 from nifty import *
 
@@ -31,7 +31,7 @@ class ConjugateGradient_Tests(unittest.TestCase):
         
         if position.domain[0] != space:
             raise TypeError
-        if type(convergence) != float:
+        if type(convergence) != int:
             raise TypeError
 
     @expand(product(spaces, [10,  100, 1000], [1E-3, 1E-4, 1E-5], [2, 3, 4] ))
@@ -49,7 +49,7 @@ class ConjugateGradient_Tests(unittest.TestCase):
                                     
         (position, convergence) = minimizer(A=A, x0=x0, b=b)
         
-        assert_approx_equal(position.val.get_full_data(), 
+        assert_almost_equal(position.val.get_full_data(), 
                             test_x.val.get_full_data(), significant=3)
         assert_equal(convergence, convergence_level+1)
 

test/test_minimization/test_relaxed_newton.py

 
 import unittest
 
-from numpy.testing import assert_approx_equal, assert_equal
+from numpy.testing import assert_equal, assert_almost_equal
 
 from nifty import *
 
@@ -58,7 +58,7 @@ class RelaxedNewton_Tests(unittest.TestCase):
         
         if energy.position.domain[0] != space:
             raise TypeError
-        if type(convergence) != float:
+        if type(convergence) != int:
             raise TypeError
 
     @expand(product(spaces, [10,  100, 1000], [1E-3, 1E-4, 1E-5], [2, 3, 4] ))
@@ -76,8 +76,8 @@ class RelaxedNewton_Tests(unittest.TestCase):
                                     
         (energy, convergence) = minimizer(energy)
         
-        assert_approx_equal(energy.value, 0, significant=3)
-        assert_approx_equal(energy.position.val.get_full_data(), 
+        assert_almost_equal(energy.value, 0, significant=3)
+        assert_almost_equal(energy.position.val.get_full_data(), 
                             test_x.val.get_full_data(), significant=3)
         assert_equal(convergence, convergence_level+2)
 

test/test_minimization/test_steepest_descent.py

 import unittest
 
-from numpy.testing import assert_approx_equal, assert_equal
+from numpy.testing import  assert_equal, assert_almost_equal
 
 from nifty import *
 
@@ -58,7 +58,7 @@ class SteepestDescent_Tests(unittest.TestCase):
         
         if energy.position.domain[0] != space:
             raise TypeError
-        if type(convergence) != float:
+        if type(convergence) != int:
             raise TypeError
 
     @expand(product(spaces, [10,  100, 1000], [1E-3, 1E-4, 1E-5], [2, 3, 4] ))
@@ -76,7 +76,7 @@ class SteepestDescent_Tests(unittest.TestCase):
                                     
         (energy, convergence) = minimizer(energy)
         
-        assert_approx_equal(energy.value, 0, significant=3)
-        assert_approx_equal(energy.position.val.get_full_data(), 
+        assert_almost_equal(energy.value, 0, significant=3)
+        assert_almost_equal(energy.position.val.get_full_data(), 
                             test_x.val.get_full_data(), significant=3)
         assert_equal(convergence, convergence_level+2)

test/test_minimization/test_vl_bfgs.py

 import unittest
 
-from numpy.testing import assert_approx_equal, assert_equal
+from numpy.testing import assert_equal, assert_almost_equal
 
 from nifty import *
 
@@ -57,7 +57,7 @@ class VL_BFGS_Tests(unittest.TestCase):
         
         if energy.position.domain[0] != space:
             raise TypeError
-        if type(convergence) != float:
+        if type(convergence) != int:
             raise TypeError
 
     @expand(product(spaces, [10,  100, 1000], [1E-3, 1E-4, 1E-5], [2, 3, 4] ))
@@ -75,8 +75,8 @@ class VL_BFGS_Tests(unittest.TestCase):
                                     
         (energy, convergence) = minimizer(energy)
         
-        assert_approx_equal(energy.value, 0, significant=3)
-        assert_approx_equal(energy.position.val.get_full_data(), 
+        assert_almost_equal(energy.value, 0, significant=3)
+        assert_almost_equal(energy.position.val.get_full_data(), 
                             test_x.val.get_full_data(), significant=3)
         assert_equal(convergence, convergence_level)