Commit3e99742

committed

enable non-slycot testing + minor cleanup after rebase

1 parente26f765 commit3e99742Copy full SHA for 3e99742

File tree

-8

lines changed

-8

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -638,15 +638,15 @@ def dlqr(args, *keywords):`
`638`	`638`	* ``dlqr(A, B, Q, R)``
`639`	`639`	* ``dlqr(A, B, Q, R, N)``
`640`	`640`
`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
`643`	`643`	`not be 0.)`
`644`	`644`
`645`	`645`	`Parameters`
`646`	`646`	`----------`
`647`	`647`	`A, B : 2D array`
`648`	`648`	`Dynamics and input matrices`
`649`		- dsys : LTI :class:`StateSpace`
	`649`	+ dsys : LTI :class:`StateSpace`
`650`	`650`	`Discrete-time linear system`
`651`	`651`	`Q, R : 2D array`
`652`	`652`	`State and input weight matrices`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@`
`48`	`48`	`classTestMatrixEquations:`
`49`	`49`	`"""These are tests for the matrix equation solvers in mateqn.py"""`
`50`	`50`
`51`		`-@slycotonly`
`52`	`51`	`deftest_lyap(self):`
`53`	`52`	`A=array([[-1,1], [-1,0]])`
`54`	`53`	`Q=array([[1,0], [0,1]])`
`@@ -68,7 +67,6 @@ def test_lyap(self):`
`68`	`67`	`X_slycot=lyap(A,Q,method='slycot')`
`69`	`68`	`assert_array_almost_equal(X_scipy,X_slycot)`
`70`	`69`
`71`		`-@slycotonly`
`72`	`70`	`deftest_lyap_sylvester(self):`
`73`	`71`	`A=5`
`74`	`72`	`B=array([[4,3], [4,3]])`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@`
`11`	`11`	`fromcontrol.exceptionimportControlDimension,ControlSlycot, \`
`12`	`12`	`ControlArgument,slycot_check`
`13`	`13`	`fromcontrol.mateqnimportcare,dare`
`14`		`-fromcontrol.statefbkimport (ctrb,obsv,place,place_varga,lqr,dlqr,`
`15`		`-lqe,dlqe,gram,acker)`
	`14`	`+fromcontrol.statefbkimport (ctrb,obsv,place,place_varga,lqr,dlqr,`
	`15`	`+lqe,dlqe,gram,acker)`
`16`	`16`	`fromcontrol.tests.conftestimport (slycotonly,check_deprecated_matrix,`
`17`	`17`	`ismatarrayout,asmatarrayout)`
`18`	`18`
`@@ -507,7 +507,7 @@ def test_care(self, matarrayin):`
`507`	`507`	`X,L,G=care(A,B,Q,R,S,E,stabilizing=False)`
`508`	`508`
`509`	`509`	`@pytest.mark.parametrize(`
`510`		`-"stabilizing",`
	`510`	`+"stabilizing",`
`511`	`511`	`[True,pytest.param(False,marks=slycotonly)])`
`512`	`512`	`deftest_dare(self,matarrayin,stabilizing):`
`513`	`513`	`"""Test stabilizing and anti-stabilizing feedback, discrete"""`

Comments

(0)