* sysnorm: Changed default tolerance in norm to 1e-6.

Henrik Sandberg · Henrik Sandberg · commit bad229a6006a · 2024-02-18T17:28:11.000+01:00
* sysnorm_test: Use default tolerance in the tests.
diff --git a/control/sysnorm.py b/control/sysnorm.py
@@ -83,7 +83,7 @@ def _h2norm_slycot(sys, print_warning=True):
 
 #------------------------------------------------------------------------------
 
-def norm(system, p=2, tol=1e-10, print_warning=True, method=None):
+def norm(system, p=2, tol=1e-6, print_warning=True, method=None):
     """Computes norm of system.
     
     Parameters
diff --git a/control/tests/sysnorm_test.py b/control/tests/sysnorm_test.py
@@ -16,11 +16,11 @@ def test_norm_1st_order_stable_system():
     s = ct.tf('s')
     
     G1 = 1/(s+1)
-    assert np.allclose(ct.norm(G1, p='inf', tol=1e-9 ), 1.0) # Comparison to norm computed in MATLAB
+    assert np.allclose(ct.norm(G1, p='inf'), 1.0) # Comparison to norm computed in MATLAB
     assert np.allclose(ct.norm(G1, p=2), 0.707106781186547) # Comparison to norm computed in MATLAB
     
     Gd1 = ct.sample_system(G1, 0.1)
-    assert np.allclose(ct.norm(Gd1, p='inf', tol=1e-9), 1.0) # Comparison to norm computed in MATLAB
+    assert np.allclose(ct.norm(Gd1, p='inf'), 1.0) # Comparison to norm computed in MATLAB
     assert np.allclose(ct.norm(Gd1, p=2), 0.223513699524858) # Comparison to norm computed in MATLAB
 
 
@@ -29,12 +29,12 @@ def test_norm_1st_order_unstable_system():
     s = ct.tf('s')
     
     G2 = 1/(1-s)
-    assert np.allclose(ct.norm(G2, p='inf', tol=1e-9), 1.0) # Comparison to norm computed in MATLAB
+    assert np.allclose(ct.norm(G2, p='inf'), 1.0) # Comparison to norm computed in MATLAB
     with pytest.warns(UserWarning, match="System is unstable!"):
         assert ct.norm(G2, p=2) == float('inf') # Comparison to norm computed in MATLAB
     
     Gd2 = ct.sample_system(G2, 0.1)
-    assert np.allclose(ct.norm(Gd2, p='inf', tol=1e-9), 1.0) # Comparison to norm computed in MATLAB
+    assert np.allclose(ct.norm(Gd2, p='inf'), 1.0) # Comparison to norm computed in MATLAB
     with pytest.warns(UserWarning, match="System is unstable!"):
         assert ct.norm(Gd2, p=2) == float('inf') # Comparison to norm computed in MATLAB
 
@@ -66,9 +66,9 @@ def test_norm_3rd_order_mimo_system():
                   [-0.863652821988714,  -1.214117043615409,  -0.006849328103348]])
     D = np.zeros((2,2))
     G4 = ct.ss(A,B,C,D) # Random system generated in MATLAB
-    assert np.allclose(ct.norm(G4, p='inf', tol=1e-9), 4.276759162964244) # Comparison to norm computed in MATLAB
+    assert np.allclose(ct.norm(G4, p='inf'), 4.276759162964244) # Comparison to norm computed in MATLAB
     assert np.allclose(ct.norm(G4, p=2), 2.237461821810309) # Comparison to norm computed in MATLAB
     
     Gd4 = ct.sample_system(G4, 0.1)
-    assert np.allclose(ct.norm(Gd4, p='inf', tol=1e-9), 4.276759162964228) # Comparison to norm computed in MATLAB
+    assert np.allclose(ct.norm(Gd4, p='inf'), 4.276759162964228) # Comparison to norm computed in MATLAB
     assert np.allclose(ct.norm(Gd4, p=2), 0.707434962289554) # Comparison to norm computed in MATLAB
