Commitb44d5ba

committed

address final (?)@slivingston comments

1 parent996211c commitb44d5baCopy full SHA for b44d5ba

File tree

+21

-5

lines changed

+21

-5

lines changed

Lines changed: 19 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -320,14 +320,30 @@ def test_system_indexing(self):`
`320`	`320`	`sys2=sys[1:,1:]`
`321`	`321`	`assertsys2.name=='PRE'+sys.name+'POST'`
`322`	`322`
`323`		`-deftest_repr_format(self):`
	`323`	`+@pytest.mark.parametrize("kwargs", [`
	`324`	`+ {},`
	`325`	`+ {'name':'mysys'},`
	`326`	`+ {'inputs':1},`
	`327`	`+ {'inputs':'u'},`
	`328`	`+ {'outputs':1},`
	`329`	`+ {'outputs':'y'},`
	`330`	`+ {'states':1},`
	`331`	`+ {'states':'x'},`
	`332`	`+ {'inputs':1,'outputs':'y','states':'x'},`
	`333`	`+ {'dt':0.1}`
	`334`	`+ ])`
	`335`	`+deftest_repr_format(self,kwargs):`
`324`	`336`	`from ..statespimportStateSpace`
`325`	`337`	`fromnumpyimportarray`
`326`	`338`
`327`		`-sys=ct.ss([[1]], [[1]], [[1]], [[0]])`
	`339`	`+sys=ct.ss([[1]], [[1]], [[1]], [[0]],**kwargs)`
`328`	`340`	`new=eval(repr(sys))`
`329`	`341`	`forattrin ['A','B','C','D']:`
`330`		`-assertgetattr(sys,attr)==getattr(sys,attr)`
	`342`	`+assertgetattr(new,attr)==getattr(sys,attr)`
	`343`	`+forpropin ['input_labels','output_labels','state_labels']:`
	`344`	`+assertgetattr(new,attr)==getattr(sys,attr)`
	`345`	`+if'name'inkwargs:`
	`346`	`+assertnew.name==sys.name`
`331`	`347`
`332`	`348`
`333`	`349`	`deftest_config_context_manager():`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2351,7 +2351,7 @@ def test_iosys_repr(fcn, spec, expected, missing, format):`
`2351`	`2351`	`sys.repr_format=format`
`2352`	`2352`	`out=repr(sys)`
`2353`	`2353`	`ifformat=='eval':`
`2354`		`-assertre.search(expected,out)!=None`
	`2354`	`+assertre.search(expected,out)isnotNone`
`2355`	`2355`
`2356`	`2356`	`ifmissingisnotNone:`
`2357`	`2357`	`assertre.search(missing,out)isNone`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"source": [`
`8`	`8`	`"# System Representation Gallery\n",`
`9`	`9`	`"\n",`
`10`		-"This Jupyter notebook creates different types of systems and generates a variety of representations (`__repr__`, `__str__`) for those systems that can be used to compare different versions of python-control. It is mainly intended for uses by developers to make sure there are no unexpected changes in representation formats, but also has someinterest examples of different choices in system representation."
	`10`	+"This Jupyter notebook creates different types of systems and generates a variety of representations (`__repr__`, `__str__`) for those systems that can be used to compare different versions of python-control. It is mainly intended for uses by developers to make sure there are no unexpected changes in representation formats, but also has someinteresting examples of different choices in system representation."
`11`	`11`	`]`
`12`	`12`	`},`
`13`	`13`	`{`

Comments

(0)