Commitcab7fa0

authored

Merge pull request#219 from murrayrm/fix_slycot-zero

Fix slycot zeroSmall fix of a bug that is blocking 0.8.0 release => merging without external review.

2 parentsf79fbe4 +87ec281 commitcab7fa0Copy full SHA for cab7fa0

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,11 @@ def zero(self):`
`525`	`525`	`out=ab08nd(self.A.shape[0],self.B.shape[1],self.C.shape[0],`
`526`	`526`	`self.A,self.B,self.C,self.D)`
`527`	`527`	`nu=out[0]`
`528`		`-returnsp.linalg.eigvals(out[8][0:nu,0:nu],out[9][0:nu,0:nu])`
	`528`	`+ifnu==0:`
	`529`	`+returnnp.array([])`
	`530`	`+else:`
	`531`	`+returnsp.linalg.eigvals(out[8][0:nu,0:nu],out[9][0:nu,0:nu])`
	`532`	`+`
`529`	`533`	`exceptImportError:# Slycot unavailable. Fall back to scipy.`
`530`	`534`	`ifself.C.shape[0]!=self.D.shape[1]:`
`531`	`535`	`raiseNotImplementedError("StateSpace.zero only supports "`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,11 @@ def testPole(self):`
`42`	`42`
`43`	`43`	`np.testing.assert_array_almost_equal(p,true_p)`
`44`	`44`
	`45`	`+deftestEmptyZero(self):`
	`46`	`+"""Test to make sure zero() works with no zeros in system"""`
	`47`	`+sys=_convertToStateSpace(TransferFunction([1], [1,2,1]))`
	`48`	`+np.testing.assert_array_equal(sys.zero(),np.array([]))`
	`49`	`+`
`45`	`50`	`@unittest.skipIf(notslycot_check(),"slycot not installed")`
`46`	`51`	`deftestMIMOZero_nonsquare(self):`
`47`	`52`	`"""Evaluate the zeros of a MIMO system."""`

Comments

(0)