Commit7a209f7

authored

Merge pull request#1003 from gdmcbain/rlocus-k

process legacy rlocus keyword k->gains

2 parents6178097 +12865cf commit7a209f7Copy full SHA for 7a209f7

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,8 @@ def root_locus_plot(`
`160`	`160`	`from .pzmapimportpole_zero_plot`
`161`	`161`
`162`	`162`	`# Legacy parameters`
`163`		`-gains=config._process_legacy_keyword(kwargs,'kvect','gains',gains)`
	`163`	`+foroldkeyin ['kvect','k']:`
	`164`	`+gains=config._process_legacy_keyword(kwargs,oldkey,'gains',gains)`
`164`	`165`
`165`	`166`	`# Set default parameters`
`166`	`167`	`grid=config._get_param('rlocus','grid',grid,_rlocus_defaults)`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -181,10 +181,11 @@ def test_root_locus_plots(sys, grid, xlim, ylim, interactive):`
`181`	`181`
`182`	`182`
`183`	`183`	`# Test deprecated keywords`
`184`		`-deftest_root_locus_legacy():`
	`184`	`+@pytest.mark.parametrize("keyword", ["kvect","k"])`
	`185`	`+deftest_root_locus_legacy(keyword):`
`185`	`186`	`sys=ct.rss(2,1,1)`
`186`		`-withpytest.warns(DeprecationWarning,match="'kvect' is deprecated"):`
`187`		`-ct.root_locus_plot(sys,kvect=[0,1,2])`
	`187`	`+withpytest.warns(DeprecationWarning,match=f"'{keyword}' is deprecated"):`
	`188`	`+ct.root_locus_plot(sys,**{keyword:[0,1,2]})`
`188`	`189`
`189`	`190`
`190`	`191`	`# Generate plots used in documentation`

Comments

(0)