enable non-slycot testing + minor cleanup after rebase

python-control · Dec 26, 2021 · 3e99742 · 3e99742
1 parent e26f765
commit 3e99742
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/control/statefbk.py b/control/statefbk.py
@@ -638,15 +638,15 @@ def dlqr(*args, **keywords):
     * ``dlqr(A, B, Q, R)``
     * ``dlqr(A, B, Q, R, N)``
 
-    where `dsys` is a discrete-time :class:`StateSpace` system, and `A`, `B`, 
-    `Q`, `R`, and `N` are 2d arrays of appropriate dimension (`dsys.dt` must 
+    where `dsys` is a discrete-time :class:`StateSpace` system, and `A`, `B`,
+    `Q`, `R`, and `N` are 2d arrays of appropriate dimension (`dsys.dt` must
     not be 0.)
 
     Parameters
     ----------
     A, B : 2D array
         Dynamics and input matrices
-    dsys : LTI :class:`StateSpace` 
+    dsys : LTI :class:`StateSpace`
         Discrete-time linear system
     Q, R : 2D array
         State and input weight matrices

diff --git a/control/tests/mateqn_test.py b/control/tests/mateqn_test.py
@@ -48,7 +48,6 @@
 class TestMatrixEquations:
     """These are tests for the matrix equation solvers in mateqn.py"""
 
-    @slycotonly
     def test_lyap(self):
         A = array([[-1, 1], [-1, 0]])
         Q = array([[1, 0], [0, 1]])
@@ -68,7 +67,6 @@ def test_lyap(self):
             X_slycot = lyap(A, Q, method='slycot')
             assert_array_almost_equal(X_scipy, X_slycot)
 
-    @slycotonly
     def test_lyap_sylvester(self):
         A = 5
         B = array([[4, 3], [4, 3]])

diff --git a/control/tests/statefbk_test.py b/control/tests/statefbk_test.py
@@ -11,8 +11,8 @@
 from control.exception import ControlDimension, ControlSlycot, \
     ControlArgument, slycot_check
 from control.mateqn import care, dare
-from control.statefbk import (ctrb, obsv, place, place_varga, lqr, dlqr, 
-                              lqe, dlqe, gram, acker)              
+from control.statefbk import (ctrb, obsv, place, place_varga, lqr, dlqr,
+                              lqe, dlqe, gram, acker)
 from control.tests.conftest import (slycotonly, check_deprecated_matrix,
                                     ismatarrayout, asmatarrayout)
 
@@ -507,7 +507,7 @@ def test_care(self, matarrayin):
                 X, L, G = care(A, B, Q, R, S, E, stabilizing=False)
 
     @pytest.mark.parametrize(
-        "stabilizing", 
+        "stabilizing",
         [True, pytest.param(False, marks=slycotonly)])
     def test_dare(self, matarrayin, stabilizing):
         """Test stabilizing and anti-stabilizing feedback, discrete"""