fix syntax errrors in test_sb.py

bnavigator · bnavigator · commit d6d910512ec8 · 2020-04-14T00:07:50.000+02:00
diff --git a/slycot/tests/test_sb.py b/slycot/tests/test_sb.py
@@ -2,7 +2,7 @@
 # sb* synthesis tests
 
 from slycot import synthesis
-import numpy as np
+from numpy import array, eye, zeros
 from numpy.testing import assert_allclose
 
 
@@ -18,20 +18,22 @@ def test_sb02mt():
 
 def test_sb10ad():
     """Test sb10ad, Hinf synthesis"""
-    a = np.array([[-1]])
-    b = np.array([[1, 1]])
-    c = np.array([[1], [1]])
-    d = np.array([[0, 1], [1, 0]])
+    a = array([[-1]])
+    b = array([[1, 1]])
+    c = array([[1],
+               [1]])
+    d = array([[0, 1],
+               [1, 0]])
 
     n = 1
     m = 2
-    np_ = 2
+    np = 2
     ncon = 1
     nmeas = 1
     gamma = 10
 
     gamma_est, Ak, Bk, Ck, Dk, Ac, Bc, Cc, Dc, rcond = synthesis.sb10ad(
-        n, m, np_, ncon, nmeas, gamma, a, b, c, d)
+        n, m, np, ncon, nmeas, gamma, a, b, c, d)
     # from Octave, which also uses SB10AD:
     #   a= -1; b1= 1; b2= 1; c1= 1; c2= 1; d11= 0; d12= 1; d21= 1; d22= 0;
     #   g = ss(a,[b1,b2],[c1;c2],[d11,d12;d21,d22]);
@@ -40,9 +42,9 @@ def test_sb10ad():
     # gamma values don't match; not sure that's critical
     # this is a bit fragile
     # a simpler, more robust check might be to check stability of Ac
-    assert_allclose(Ak, np.array([[-3.]]))
-    assert_allclose(Ac, np.array([[-1., -1.]
-                                  [1., -3.]]))
+    assert_allclose(Ak, array([[-3.]]))
+    assert_allclose(Ac, array([[-1., -1.],
+                               [1., -3.]]))
 
 
 def test_sb10jd():
@@ -53,46 +55,45 @@ def test_sb10jd():
     m = 1
     np = 6
 
-    A = np.array([[ 0,  0,  0, -1,  1,  0],
-                  [ 0, 32,  0,  0, -1,  1],
-                  [ 0,  0,  1,  0,  0,  0],
-                  [ 0,  0,  0,  1,  0,  0],
-                  [-1,  1,  0,  0,  0,  0],
-                  [ 0, -1,  1,  0,  0,  0]])
-    E = np.array([[  0,   0,   0,   0,   0,   0],
-                  [  0,   0,   0,   0,   0,   0],
-                  [  0,   0,   0, -10,   0,  10],
-                  [  0,   0,   0,   0,   0,   0],
-                  [  0,   0,   0,   0,   0,   0],
-                  [  0,   0,   0,   0,   0,   0]])
-    B = np.array([[-7.1],
-                  [ 0. ],
-                  [ 0. ],
-                  [ 0. ],
-                  [ 0. ],
-                  [ 0. ]])
-    C = np.eye(6)
-    D = np.zeros((7,1))
+    A = array([[ 0,  0,  0, -1,  1,  0],
+               [ 0, 32,  0,  0, -1,  1],
+               [ 0,  0,  1,  0,  0,  0],
+               [ 0,  0,  0,  1,  0,  0],
+               [-1,  1,  0,  0,  0,  0],
+               [ 0, -1,  1,  0,  0,  0]])
+    E = array([[  0,   0,   0,   0,   0,   0],
+               [  0,   0,   0,   0,   0,   0],
+               [  0,   0,   0, -10,   0,  10],
+               [  0,   0,   0,   0,   0,   0],
+               [  0,   0,   0,   0,   0,   0],
+               [  0,   0,   0,   0,   0,   0]])
+    B = array([[-7.1],
+               [ 0. ],
+               [ 0. ],
+               [ 0. ],
+               [ 0. ],
+               [ 0. ]])
+    C = eye(6)
+    D = zeros((7, 1))
 
     # test1 expected results
-    Aexp = np.array([[-0.00312500]])
-    Bexp = np.array([[ 0.05899985]])
-    Cexp = np.array([[-1.17518847e-02],
-                     [-1.17518847e-02],
-                     [-1.17518847e-02],
-                     [ 0.00000000e+00],
-                     [ 0.00000000e+00],
-                     [ 3.76060309e-01]])
-    Dexp = np.array([[ 2.21875000e-01],
-                     [ 2.21875000e-01],
-                     [ 2.21875000e-01],
-                     [ 0.00000000e+00],
-                     [ 7.10000000e+00],
-                     [ 0.00000000e+00]])
+    Aexp = array([[-0.00312500]])
+    Bexp = array([[ 0.05899985]])
+    Cexp = array([[-1.17518847e-02],
+                  [-1.17518847e-02],
+                  [-1.17518847e-02],
+                  [ 0.00000000e+00],
+                  [ 0.00000000e+00],
+                  [ 3.76060309e-01]])
+    Dexp = array([[ 2.21875000e-01],
+                  [ 2.21875000e-01],
+                  [ 2.21875000e-01],
+                  [ 0.00000000e+00],
+                  [ 7.10000000e+00],
+                  [ 0.00000000e+00]])
 
     A_r, B_r, C_r, D_r = synthesis.sb10jd(n, m, np, A, B, C, D, E)
     assert_allclose(A, Aexp)
     assert_allclose(B, Bexp)
     assert_allclose(C, Cexp)
     assert_allclose(D, Dexp)
-
