Commit98fba6e

authored and

committed

use standard method to assess whether a system is a static gain, so that it has dt=None by default, when constructing a LinearIOSystem

1 parentdc633d0 commit98fba6eCopy full SHA for 98fba6e

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -346,9 +346,8 @@ def __init__(self, args, init_namedio=True, *kwargs):`
`346`	`346`	`defaults=args[0]iflen(args)==1else \`
`347`	`347`	`{'inputs':D.shape[1],'outputs':D.shape[0],`
`348`	`348`	`'states':A.shape[0]}`
`349`		`-static= (A.size==0)`
`350`	`349`	`name,inputs,outputs,states,dt=_process_namedio_keywords(`
`351`		`-kwargs,defaults,static=static,end=True)`
	`350`	`+kwargs,defaults,static=self._isstatic(),end=True)`
`352`	`351`
`353`	`352`	`# Initialize LTI (NamedIOSystem) object`
`354`	`353`	`super().__init__(`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ class TSys:`
`41`	`41`	`[[-1,1], [0,-2]], [[0,1], [1,0]],`
`42`	`42`	`[[1,0], [0,1]],np.zeros((2,2)))`
`43`	`43`
	`44`	`+# Create a static gain linear system`
	`45`	`+T.staticgain=ct.StateSpace(0,0,0,1)`
	`46`	`+`
`44`	`47`	`# Create simulation parameters`
`45`	`48`	`T.T=np.linspace(0,10,100)`
`46`	`49`	`T.U=np.sin(T.T)`
`@@ -70,6 +73,12 @@ def test_linear_iosys(self, tsys):`
`70`	`73`	`# system results in a LinearIOSystem`
`71`	`74`	`assertisinstance(linsys*iosys,ios.LinearIOSystem)`
`72`	`75`
	`76`	`+# Make sure that a static linear system has dt=None`
	`77`	`+# and otherwise dt is as specified`
	`78`	`+assertios.LinearIOSystem(tsys.staticgain).dtisNone`
	`79`	`+assertios.LinearIOSystem(tsys.staticgain,dt=.1).dt==.1`
	`80`	`+`
	`81`	`+`
`73`	`82`	`deftest_tf2io(self,tsys):`
`74`	`83`	`# Create a transfer function from the state space system`
`75`	`84`	`linsys=tsys.siso_linsys`

Comments

(0)