8000 enable non-slycot testing + minor cleanup after rebase · python-control/python-control@3e99742 · GitHub
[go: up one dir, main page]
Skip to content

Commit 3e99742

Browse files
murrayrmmurrayrm
committed
enable non-slycot testing + minor cleanup after rebase
1 parent e26f765 commit 3e99742

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

‎control/statefbk.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -638,15 +638,15 @@ def dlqr(*args, **keywords):
638638
* ``dlqr(A, B, Q, R)``
639639
* ``dlqr(A, B, Q, R, N)``
640640
641-
where `dsys` is a discrete-time :class:`StateSpace` system, and `A`, `B`,
642-
`Q`, `R`, and `N` are 2d arrays of appropriate dimension (`dsys.dt` must
641+
where `dsys` is a discrete-time :class:`StateSpace` system, and `A`, `B`,
642+
`Q`, `R`, and `N` are 2d arrays of appropriate dimension (`dsys.dt` must
643643
not be 0.)
644644
645645
Parameters
646646
----------
647647
A, B : 2D array
648648
Dynamics and input matrices
649-
dsys : LTI :class:`StateSpace`
649+
dsys : LTI :class:`StateSpace`
650650
Discrete-time linear system
651651
Q, R : 2D array
652652
State and input weight matrices

‎control/tests/mateqn_test.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
class TestMatrixEquations:
4949
"""These are tests for the matrix equation solvers in mateqn.py"""
5050

51-
@slycotonly
5251
def test_lyap(self):
5352
A = array([[-1, 1], [-1, 0]])
5453
Q = array([[1, 0], [0, 1]])
@@ -68,7 +67,6 @@ def test_lyap(self):
6867
X_slycot = lyap(A, Q, method='slycot')
6968
assert_array_almost_equal(X_scipy, X_slycot)
7069

71-
@slycotonly
7270
def test_lyap_sylvester(self):
7371
A = 5
7472
B = array([[4, 3], [4, 3]])

‎control/tests/statefbk_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from control.exception import ControlDimension, ControlSlycot, \
1212
ControlArgument, slycot_check
1313
from control.mateqn import care, dare
14-
from control.statefbk import (ctrb, obsv, place, place_varga, lqr, dlqr,
15-
lqe, dlqe, gram, acker)
14+
from control.statefbk import (ctrb, obsv, place, place_varga, lqr, dlqr,
15+
lqe, dlqe, gram, acker)
1616
from control.tests.conftest import (slycotonly, check_deprecated_matrix,
1717
ismatarrayout, asmatarrayout)
1818

@@ -507,7 +507,7 @@ def test_care(self, matarrayin):
507507
X, L, G = care(A, B, Q, R, S, E, stabilizing=False)
508508

509509
@pytest.mark.parametrize(
510-
"stabilizing",
510+
"stabilizing",
511511
[True, pytest.param(False, marks=slycotonly)])
512512
def test_dare(self, matarrayin, stabilizing):
513513
"""Test stabilizing and anti-stabilizing feedback, discrete"""

0 commit comments

Comments
 (0)
0