Updated tests (np.all to np.allclose and remove depcrecation warning)

Author: lindonroberts

pybobyqa/tests/test_trust_region.py

@@ -89,7 +89,7 @@ def runTest(self):
         # self.assertAlmostEqual(est_min, true_min, 'Wrong min value')
         s_cauchy, red_cauchy, crvmin_cauchy = cauchy_pt(g, H, Delta)
         self.assertTrue(est_min <= red_cauchy, 'Cauchy reduction not achieved')
-        self.assertTrue(np.all(gnew == g + H.dot(d)), 'Wrong gnew')
+        self.assertTrue(np.allclose(gnew, g + H.dot(d)), 'Wrong gnew')
         # print(crvmin)
         self.assertAlmostEqual(crvmin, 1.2, 'Wrong crvmin')
 
@@ -112,7 +112,7 @@ def runTest(self):
         # self.assertAlmostEqual(est_min, true_min, 'Wrong min value')
         s_cauchy, red_cauchy, crvmin_cauchy = cauchy_pt(g, H, Delta)
         self.assertTrue(est_min <= red_cauchy, 'Cauchy reduction not achieved')
-        self.assertTrue(np.all(gnew == g + H.dot(d)), 'Wrong gnew')
+        self.assertTrue(np.allclose(gnew, g + H.dot(d)), 'Wrong gnew')
         self.assertAlmostEqual(crvmin, 0.0, 'Wrong crvmin')
 
 
@@ -134,7 +134,7 @@ def runTest(self):
         # self.assertAlmostEqual(est_min, true_min, 'Wrong min value')
         s_cauchy, red_cauchy, crvmin_cauchy = cauchy_pt(g, H, Delta)
         self.assertTrue(est_min <= red_cauchy, 'Cauchy reduction not achieved')
-        self.assertTrue(np.all(gnew == g + H.dot(d)), 'Wrong gnew')
+        self.assertTrue(np.allclose(gnew, g + H.dot(d)), 'Wrong gnew')
         self.assertAlmostEqual(crvmin, 0.0, 'Wrong crvmin')
 
 
@@ -156,7 +156,7 @@ def runTest(self):
         # self.assertAlmostEqual(est_min, true_min, 'Wrong min value')
         s_cauchy, red_cauchy, crvmin_cauchy = cauchy_pt(g, H, Delta)
         self.assertTrue(est_min <= red_cauchy, 'Cauchy reduction not achieved')
-        self.assertTrue(np.all(gnew == g + H.dot(d)), 'Wrong gnew')
+        self.assertTrue(np.allclose(gnew, g + H.dot(d)), 'Wrong gnew')
         self.assertAlmostEqual(crvmin, 0.0, 'Wrong crvmin')
         # self.assertAlmostEqual(crvmin, crvmin_cauchy, 'Wrong crvmin')
 
@@ -179,7 +179,7 @@ def runTest(self):
         # self.assertAlmostEqual(est_min, true_min, 'Wrong min value')
         s_cauchy, red_cauchy, crvmin_cauchy = cauchy_pt(g, H, Delta)
         self.assertTrue(est_min <= red_cauchy, 'Cauchy reduction not achieved')
-        self.assertTrue(np.all(gnew == g + H.dot(d)), 'Wrong gnew')
+        self.assertTrue(np.allclose(gnew, g + H.dot(d)), 'Wrong gnew')
         self.assertAlmostEqual(crvmin, 0.0, 'Wrong crvmin')
 
 
@@ -203,7 +203,7 @@ def runTest(self):
         # print(s_cauchy)
         # print(d)
         self.assertTrue(est_min <= red_cauchy, 'Cauchy reduction not achieved')
-        self.assertTrue(np.all(gnew == g + H.dot(d)), 'Wrong gnew')
+        self.assertTrue(np.allclose(gnew, g + H.dot(d)), 'Wrong gnew')
         # print(crvmin)
         self.assertAlmostEqual(crvmin, -1.0, 'Wrong crvmin')
 

pybobyqa/tests/test_util.py

@@ -52,10 +52,10 @@ def runTest(self):
 class TestModelValue(unittest.TestCase):
     def runTest(self):
         n = 5
-        A = np.arange(n ** 2, dtype=np.float).reshape((n, n))
+        A = np.arange(n ** 2, dtype=float).reshape((n, n))
         H = np.sin(A + A.T)  # force symmetric
-        vec = np.exp(np.arange(n, dtype=np.float))
-        g = np.cos(3*np.arange(n, dtype=np.float) - 2.0)
+        vec = np.exp(np.arange(n, dtype=float))
+        g = np.cos(3*np.arange(n, dtype=float) - 2.0)
         mval = np.dot(g, vec) + 0.5 * np.dot(vec, np.dot(H, vec))
         self.assertAlmostEqual(mval, model_value(g, H, vec), msg='Wrong value')