Commit81ebbcf

authored

Merge pull request#212 from murrayrm/fix_statespace

Fix statespace issues causing Travis CI failures

2 parents115223e +e6447ea commit81ebbcfCopy full SHA for 81ebbcf

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -537,8 +537,9 @@ def zero(self):`
`537`	`537`	`# from`
`538`	`538`	`# https://dspace.mit.edu/bitstream/handle/1721.1/841/P-0802-06587335.pdf.`
`539`	`539`	`# The QZ algorithm solves the generalized eigenvalue problem: given`
`540`		-# `L = [A, B; C, D]` and `M = [I_nxn 0]`, find all finite λ for
`541`		-# which there exist nontrivial solutions of the equation `Lz - λMz`.
	`540`	+# `L = [A, B; C, D]` and `M = [I_nxn 0]`, find all finite lambda
	`541`	`+# for which there exist nontrivial solutions of the equation`
	`542`	+# `Lz - lamba Mz`.
`542`	`543`	`#`
`543`	`544`	`# The generalized eigenvalue problem is only solvable if its`
`544`	`545`	`# arguments are square matrices.`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,8 @@ def testPole(self):`
`42`	`42`
`43`	`43`	`np.testing.assert_array_almost_equal(p,true_p)`
`44`	`44`
`45`		`-deftestZero(self):`
	`45`	`+@unittest.skipIf(notslycot_check(),"slycot not installed")`
	`46`	`+deftestMIMOZero_nonsquare(self):`
`46`	`47`	`"""Evaluate the zeros of a MIMO system."""`
`47`	`48`
`48`	`49`	`z=np.sort(self.sys1.zero())`

Comments

(0)