Skip to content

Commit b419f12

Browse files
author
Henrik Sandberg
committed
Lowered tolerances in tests.
1 parent 34f9537 commit b419f12

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

‎control/tests/sysnorm_test.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ def test_norm_1st_order_stable_system():
1313
"""First-order stable continuous-time system"""
1414
s = ct.tf('s')
1515
G1 = 1/(s+1)
16-
assert np.allclose(ct.norm(G1, p='inf', tol=1e-9), 1.0, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
17-
assert np.allclose(ct.norm(G1, p=2), 0.707106781186547, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
16+
assert np.allclose(ct.norm(G1, p='inf', tol=1e-9), 1.0) # Comparison to norm computed in MATLAB
17+
assert np.allclose(ct.norm(G1, p=2), 0.707106781186547) # Comparison to norm computed in MATLAB
1818

1919
Gd1 = ct.sample_system(G1, 0.1)
20-
assert np.allclose(ct.norm(Gd1, p='inf', tol=1e-9), 1.0, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
21-
assert np.allclose(ct.norm(Gd1, p=2), 0.223513699524858, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
20+
assert np.allclose(ct.norm(Gd1, p='inf', tol=1e-9), 1.0) # Comparison to norm computed in MATLAB
21+
assert np.allclose(ct.norm(Gd1, p=2), 0.223513699524858) # Comparison to norm computed in MATLAB
2222

2323

2424
def test_norm_1st_order_unstable_system():
2525
"""First-order unstable continuous-time system"""
2626
s = ct.tf('s')
2727
G2 = 1/(1-s)
28-
assert np.allclose(ct.norm(G2, p='inf', tol=1e-9), 1.0, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
28+
assert np.allclose(ct.norm(G2, p='inf', tol=1e-9), 1.0) # Comparison to norm computed in MATLAB
2929
assert ct.norm(G2, p=2) == float('inf') # Comparison to norm computed in MATLAB
3030

3131
Gd2 = ct.sample_system(G2, 0.1)
32-
assert np.allclose(ct.norm(Gd2, p='inf', tol=1e-9), 1.0, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
32+
assert np.allclose(ct.norm(Gd2, p='inf', tol=1e-9), 1.0) # Comparison to norm computed in MATLAB
3333
assert ct.norm(Gd2, p=2) == float('inf') # Comparison to norm computed in MATLAB
3434

3535
def test_norm_2nd_order_system_imag_poles():
@@ -55,9 +55,9 @@ def test_norm_3rd_order_mimo_system():
5555
[-0.863652821988714, -1.214117043615409, -0.006849328103348]])
5656
D = np.zeros((2,2))
5757
G4 = ct.ss(A,B,C,D) # Random system generated in MATLAB
58-
assert np.allclose(ct.norm(G4, p='inf', tol=1e-9), 4.276759162964244, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
59-
assert np.allclose(ct.norm(G4, p=2), 2.237461821810309, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
58+
assert np.allclose(ct.norm(G4, p='inf', tol=1e-9), 4.276759162964244) # Comparison to norm computed in MATLAB
59+
assert np.allclose(ct.norm(G4, p=2), 2.237461821810309) # Comparison to norm computed in MATLAB
6060

6161
Gd4 = ct.sample_system(G4, 0.1)
62-
assert np.allclose(ct.norm(Gd4, p='inf', tol=1e-9), 4.276759162964228, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
63-
assert np.allclose(ct.norm(Gd4, p=2), 0.707434962289554, rtol=1e-09, atol=1e-08) # Comparison to norm computed in MATLAB
62+
assert np.allclose(ct.norm(Gd4, p='inf', tol=1e-9), 4.276759162964228) # Comparison to norm computed in MATLAB
63+
assert np.allclose(ct.norm(Gd4, p=2), 0.707434962289554) # Comparison to norm computed in MATLAB

0 commit comments

Comments
 (0)