NotificationsYou must be signed in to change notification settings
Fork441
Star1.8k

Commitc5f0cbe

committed

Add eigensys_realization to __all__, change era to eigensys_realization in all files

1 parentbc21ec0 commitc5f0cbeCopy full SHA for c5f0cbe

File tree

3 files changed

+12

-12

lines changed

control
- modelsimp.py
- tests
  - modelsimp_test.py
examples
- era_msd.py

3 files changed

+12

-12

lines changed

`‎control/modelsimp.py`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`from .statefbkimportgram`
`51`	`51`	`from .timerespimportTimeResponseData`
`52`	`52`
`53`		`-__all__= ['hsvd','balred','modred','era','markov','minreal']`
	`53`	`+__all__= ['hsvd','balred','modred','eigensys_realization','markov','minreal','era']`
`54`	`54`
`55`	`55`
`56`	`56`	`# Hankel Singular Value Decomposition`
`@@ -370,7 +370,7 @@ def minreal(sys, tol=None, verbose=True):`
`370`	`370`
`371`	`371`
`372`	`372`	`defeigensys_realization(arg,r,m=None,n=None,dt=True,transpose=False):`
`373`		`-r"""era(YY, r)`
	`373`	`+r"""eigensys_realization(YY, r)`
`374`	`374`
`375`	`375`	Calculate an ERA model of order `r` based on the impulse-response data
`376`	`376`	`YY`.
`@@ -386,8 +386,8 @@ def eigensys_realization(arg, r, m=None, n=None, dt=True, transpose=False):`
`386`	`386`
`387`	`387`	`The function can be called with 2 arguments:`
`388`	`388`
`389`		- * ``sysd, S =era(data, r)``
`390`		- * ``sysd, S =era(YY, r)``
	`389`	+ * ``sysd, S =eigensys_realization(data, r)``
	`390`	+ * ``sysd, S =eigensys_realization(YY, r)``
`391`	`391`
`392`	`392`	where `response` is an `TimeResponseData` object, and `YY` is 1D or 3D
`393`	`393`	`array and r is an integer.`
`@@ -433,11 +433,11 @@ def eigensys_realization(arg, r, m=None, n=None, dt=True, transpose=False):`
`433`	`433`	`--------`
`434`	`434`	`>>> T = np.linspace(0, 10, 100)`
`435`	`435`	`>>> _, YY = ct.impulse_response(ct.tf([1], [1, 0.5], True), T)`
`436`		`- >>> sysd, _ = ct.era(YY, r=1)`
	`436`	`+ >>> sysd, _ = ct.eigensys_realization(YY, r=1)`
`437`	`437`
`438`	`438`	`>>> T = np.linspace(0, 10, 100)`
`439`	`439`	`>>> response = ct.impulse_response(ct.tf([1], [1, 0.5], True), T)`
`440`		`- >>> sysd, _ = ct.era(response, r=1)`
	`440`	`+ >>> sysd, _ = ct.eigensys_realization(response, r=1)`
`441`	`441`	`"""`
`442`	`442`	`defblock_hankel_matrix(Y,m,n):`
`443`	`443`	`"""Create a block hankel matrix from Impulse response"""`

`‎control/tests/modelsimp_test.py`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`fromcontrolimportStateSpace,impulse_response,step_response,forced_response,tf,rss,c2d`
`11`	`11`	`fromcontrol.exceptionimportControlMIMONotImplemented`
`12`	`12`	`fromcontrol.tests.conftestimportslycotonly`
`13`		`-fromcontrol.modelsimpimportbalred,hsvd,markov,modred,era`
	`13`	`+fromcontrol.modelsimpimportbalred,hsvd,markov,modred,eigensys_realization`
`14`	`14`
`15`	`15`
`16`	`16`	`classTestModelsimp:`
`@@ -129,15 +129,15 @@ def testERASignature(self):`
`129`	`129`	`ir_true=impulse_response(sysd_true,T=T)`
`130`	`130`
`131`	`131`	`# test TimeResponseData`
`132`		`-sysd_est,_=era(ir_true,r=2)`
	`132`	`+sysd_est,_=eigensys_realization(ir_true,r=2)`
`133`	`133`	`ir_est=impulse_response(sysd_est,T=T)`
`134`	`134`	`_,H_est=ir_est`
`135`	`135`
`136`	`136`	`np.testing.assert_allclose(H_true,H_est,rtol=1e-6,atol=1e-8)`
`137`	`137`
`138`	`138`	`# test ndarray`
`139`	`139`	`_,YY_true=ir_true`
`140`		`-sysd_est,_=era(YY_true,r=2)`
	`140`	`+sysd_est,_=eigensys_realization(YY_true,r=2)`
`141`	`141`	`ir_est=impulse_response(sysd_est,T=T)`
`142`	`142`	`_,H_est=ir_est`
`143`	`143`
`@@ -169,7 +169,7 @@ def testERASignature(self):`
`169`	`169`	`ir_true=impulse_response(sysd_true,T=T)`
`170`	`170`
`171`	`171`	`# test TimeResponseData`
`172`		`-sysd_est,_=era(ir_true,r=4,dt=dt)`
	`172`	`+sysd_est,_=eigensys_realization(ir_true,r=4,dt=dt)`
`173`	`173`
`174`	`174`	`step_true=step_response(sysd_true)`
`175`	`175`	`step_est=step_response(sysd_est)`
`@@ -180,7 +180,7 @@ def testERASignature(self):`
`180`	`180`
`181`	`181`	`# test ndarray`
`182`	`182`	`_,YY_true=ir_true`
`183`		`-sysd_est,_=era(YY_true,r=4,dt=dt)`
	`183`	`+sysd_est,_=eigensys_realization(YY_true,r=4,dt=dt)`
`184`	`184`
`185`	`185`	`step_true=step_response(sysd_true,T=T)`
`186`	`186`	`step_est=step_response(sysd_est,T=T)`

`‎examples/era_msd.py`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`response.plot()`
`48`	`48`	`plt.show()`
`49`	`49`
`50`		`-sysd_est,_=ct.era(response,r=4,dt=dt)`
	`50`	`+sysd_est,_=ct.eigensys_realization(response,r=4,dt=dt)`
`51`	`51`
`52`	`52`	`step_true=ct.step_response(sysd)`
`53`	`53`	`step_true.sysname="H_true"`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc5f0cbe

File tree

3 files changed

3 files changed

`‎control/modelsimp.py`

`‎control/tests/modelsimp_test.py`

`‎examples/era_msd.py`

0 commit comments