Commita69a331

committed

small fixes to address bnavigator review

1 parent03322ff commita69a331Copy full SHA for a69a331

File tree

-7

lines changed

-7

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -427,7 +427,7 @@ def test_algebraic_loop(self, tsys):`
`427`	`427`	`# Nonlinear system composed with LTI system (series) -- with states`
`428`	`428`	`ios_t,ios_y=ios.input_output_response(`
`429`	`429`	`nlioslniosnlios,T,U,X0)`
`430`		`-lti_t,lti_y,=ct.forced_response(linsys,T,U*U,X0)`
	`430`	`+lti_t,lti_y=ct.forced_response(linsys,T,U*U,X0)`
`431`	`431`	`np.testing.assert_array_almost_equal(ios_y,lti_y*lti_y,decimal=3)`
`432`	`432`
`433`	`433`	`# Nonlinear system in feeback loop with LTI system`
`@@ -483,7 +483,7 @@ def test_summer(self, tsys):`
`483`	`483`	`U= [np.sin(T),np.cos(T)]`
`484`	`484`	`X0=0`
`485`	`485`
`486`		`-lin_t,lin_y,=ct.forced_response(linsys_parallel,T,U,X0)`
	`486`	`+lin_t,lin_y=ct.forced_response(linsys_parallel,T,U,X0)`
`487`	`487`	`ios_t,ios_y=ios.input_output_response(iosys_parallel,T,U,X0)`
`488`	`488`	`np.testing.assert_allclose(ios_y,lin_y,atol=0.002,rtol=0.)`
`489`	`489`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -180,8 +180,8 @@ def test_squeeze(self, fcn, nstate, nout, ninp, squeeze, shape):`
`180`	`180`	`iffcn==ct.frd:`
`181`	`181`	`sys=fcn(ct.rss(nstate,nout,ninp),omega)`
`182`	`182`	`eliffcn==ct.tfand (nout>1orninp>1)andnotslycot_check():`
`183`		`-#Conversion of MIMO systems to transfer functionsrequire slycot`
`184`		`-return`
	`183`	`+pytest.skip("Conversion of MIMO systems to transfer functions"`
	`184`	`+"requires slycot.")`
`185`	`185`	`else:`
`186`	`186`	`sys=fcn(ct.rss(nstate,nout,ninp))`
`187`	`187`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -724,8 +724,8 @@ def test_squeeze(self, fcn, nstate, nout, ninp, squeeze, shape):`
`724`	`724`
`725`	`725`	`# Define the system`
`726`	`726`	`iffcn==ct.tfand (nout>1orninp>1)andnotslycot_check():`
`727`		`-#Conversion of MIMO systems to transfer functionsrequire slycot`
`728`		`-return`
	`727`	`+pytest.skip("Conversion of MIMO systems to transfer functions"`
	`728`	`+"requires slycot.")`
`729`	`729`	`else:`
`730`	`730`	`sys=fcn(ct.rss(nstate,nout,ninp,strictly_proper=True))`
`731`	`731`
`@@ -753,7 +753,7 @@ def test_squeeze(self, fcn, nstate, nout, ninp, squeeze, shape):`
`753`	`753`	`else:`
`754`	`754`	`assertxvec.shape[1]==8`
`755`	`755`
`756`		`-# Test caseswere we choose a subset of inputs and outputs`
	`756`	`+# Test caseswhere we choose a subset of inputs and outputs`
`757`	`757`	`_,yvec=ct.step_response(`
`758`	`758`	`sys,tvec,input=ninp-1,output=nout-1,squeeze=squeeze)`
`759`	`759`	`ifsqueezeisFalse:`

Comments

(0)