replace more assert_equal comparing possible float results

bnavigator · bnavigator · commit 13f2ce132d12 · 2021-04-24T10:54:27.000+02:00
diff --git a/control/tests/lti_test.py b/control/tests/lti_test.py
@@ -15,13 +15,13 @@ class TestLTI:
 
     def test_pole(self):
         sys = tf(126, [-1, 42])
-        np.testing.assert_equal(sys.pole(), 42)
-        np.testing.assert_equal(pole(sys), 42)
+        np.testing.assert_allclose(sys.pole(), 42)
+        np.testing.assert_allclose(pole(sys), 42)
 
     def test_zero(self):
         sys = tf([-1, 42], [1, 10])
-        np.testing.assert_equal(sys.zero(), 42)
-        np.testing.assert_equal(zero(sys), 42)
+        np.testing.assert_allclose(sys.zero(), 42)
+        np.testing.assert_allclose(zero(sys), 42)
 
     def test_issiso(self):
         assert issiso(1)
@@ -72,8 +72,8 @@ def test_damp(self):
 
     def test_dcgain(self):
         sys = tf(84, [1, 2])
-        np.testing.assert_equal(sys.dcgain(), 42)
-        np.testing.assert_equal(dcgain(sys), 42)
+        np.testing.assert_allclose(sys.dcgain(), 42)
+        np.testing.assert_allclose(dcgain(sys), 42)
 
     @pytest.mark.parametrize("dt1, dt2, expected",
                              [(None, None, True),
diff --git a/control/tests/matlab_test.py b/control/tests/matlab_test.py
@@ -420,7 +420,7 @@ def testRlocus_list(self, siso, mplcleanup):
         klist = [1, 10, 100]
         rlist, klist_out = rlocus(siso.tf2, klist, plot=False)
         np.testing.assert_equal(len(rlist), len(klist))
-        np.testing.assert_array_equal(klist, klist_out)
+        np.testing.assert_allclose(klist, klist_out)
 
     def testNyquist(self, siso):
         """Call nyquist()"""
diff --git a/control/tests/rlocus_test.py b/control/tests/rlocus_test.py
@@ -42,7 +42,7 @@ def testRootLocus(self, sys):
 
         roots, k_out = root_locus(sys, klist, plot=False)
         np.testing.assert_equal(len(roots), len(klist))
-        np.testing.assert_array_equal(klist, k_out)
+        np.testing.assert_allclose(klist, k_out)
         self.check_cl_poles(sys, roots, klist)
 
     def test_without_gains(self, sys):
diff --git a/control/tests/statesp_test.py b/control/tests/statesp_test.py
@@ -388,7 +388,7 @@ def test_freq_resp(self):
 
         np.testing.assert_almost_equal(mag, true_mag)
         np.testing.assert_almost_equal(phase, true_phase)
-        np.testing.assert_equal(omega, true_omega)
+        np.testing.assert_almost_equal(omega, true_omega)
 
         # Deprecated version of the call (should return warning)
         with pytest.warns(DeprecationWarning, match="will be removed"):
@@ -516,15 +516,15 @@ def test_dc_gain_discr(self):
         """Test DC gain for discrete-time state-space systems."""
         # static gain
         sys = StateSpace([], [], [], 2, True)
-        np.testing.assert_equal(sys.dcgain(), 2)
+        np.testing.assert_allclose(sys.dcgain(), 2)
 
         # averaging filter
         sys = StateSpace(0.5, 0.5, 1, 0, True)
         np.testing.assert_allclose(sys.dcgain(), 1)
 
         # differencer
         sys = StateSpace(0, 1, -1, 1, True)
-        np.testing.assert_equal(sys.dcgain(), 0)
+        np.testing.assert_allclose(sys.dcgain(), 0)
 
         # summer
         sys = StateSpace(1, 1, 1, 0, True)
diff --git a/control/tests/xferfcn_test.py b/control/tests/xferfcn_test.py
@@ -693,8 +693,8 @@ def test_minreal_4(self):
         h = (z - 1.00000000001) * (z + 1.0000000001) / (z**2 - 1)
         hm = h.minreal()
         hr = TransferFunction([1], [1], T)
-        np.testing.assert_array_almost_equal(hm.num[0][0], hr.num[0][0])
-        np.testing.assert_equal(hr.dt, hm.dt)
+        np.testing.assert_allclose(hm.num[0][0], hr.num[0][0])
+        np.testing.assert_allclose(hr.dt, hm.dt)
 
     @slycotonly
     def test_state_space_conversion_mimo(self):
@@ -801,10 +801,10 @@ def test_matrix_array_multiply(self, matarrayin, X_, ij):
     def test_dcgain_cont(self):
         """Test DC gain for continuous-time transfer functions"""
         sys = TransferFunction(6, 3)
-        np.testing.assert_equal(sys.dcgain(), 2)
+        np.testing.assert_allclose(sys.dcgain(), 2)
 
         sys2 = TransferFunction(6, [1, 3])
-        np.testing.assert_equal(sys2.dcgain(), 2)
+        np.testing.assert_allclose(sys2.dcgain(), 2)
 
         sys3 = TransferFunction(6, [1, 0])
         np.testing.assert_equal(sys3.dcgain(), np.inf)
@@ -819,7 +819,7 @@ def test_dcgain_discr(self):
         """Test DC gain for discrete-time transfer functions"""
         # static gain
         sys = TransferFunction(6, 3, True)
-        np.testing.assert_equal(sys.dcgain(), 2)
+        np.testing.assert_allclose(sys.dcgain(), 2)
 
         # averaging filter
         sys = TransferFunction(0.5, [1, -0.5], True)
@@ -837,7 +837,7 @@ def test_dcgain_discr(self):
 
         # summer
         sys = TransferFunction([1, -1], [1], True)
-        np.testing.assert_equal(sys.dcgain(), 0)
+        np.testing.assert_allclose(sys.dcgain(), 0)
 
     def test_ss2tf(self):
         """Test SISO ss2tf"""
