Commit20a73de

authored

Merge pull request#1065 from murrayrm/rlocus_singleton-21Nov2024

allow root locus maps with only 1 point

2 parents7649e68 +b1a7d7c commit20a73deCopy full SHA for 20a73de

File tree

+25

-9

lines changed

+25

-9

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -607,14 +607,16 @@ def _compute_root_locus_limits(response):`
`607`	`607`	`# Find the local maxima of root locus curve`
`608`	`608`	`xpeaks=np.where(`
`609`	`609`	`np.diff(np.abs(locus.real))<0,locus.real[0:-1],0)`
`610`		`-xlim= [`
`611`		`-min(xlim[0],np.min(xpeaks)*rho),`
`612`		`-max(xlim[1],np.max(xpeaks)*rho)`
`613`		`- ]`
	`610`	`+ifxpeaks.size>0:`
	`611`	`+xlim= [`
	`612`	`+min(xlim[0],np.min(xpeaks)*rho),`
	`613`	`+max(xlim[1],np.max(xpeaks)*rho)`
	`614`	`+ ]`
`614`	`615`
`615`	`616`	`ypeaks=np.where(`
`616`	`617`	`np.diff(np.abs(locus.imag))<0,locus.imag[0:-1],0)`
`617`		`-ylim=max(ylim,np.max(ypeaks)*rho)`
	`618`	`+ifypeaks.size>0:`
	`619`	`+ylim=max(ylim,np.max(ypeaks)*rho)`
`618`	`620`
`619`	`621`	`ifisctime(dt=response.dt):`
`620`	`622`	`# Adjust the limits to include some space around features`

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,9 @@ def root_locus_map(sysdata, gains=None):`
`56`	`56`	`Returns`
`57`	`57`	`-------`
`58`	`58`	`rldata : PoleZeroData or list of PoleZeroData`
`59`		`- Root locus data object(s) corresponding to the . The loci of`
`60`		`- the root locus diagram are available in the array`
`61`		- `rldata.loci`, indexed by the gain index and the locus index,
`62`		- and the gains are in the array `rldata.gains`.
	`59`	`+ Root locus data object(s). The loci of the root locus diagram are`
	`60`	+ available in the array `rldata.loci`, indexed by the gain index and
	`61`	+ the locus index, and the gains are in the array `rldata.gains`.
`63`	`62`
`64`	`63`	`Notes`
`65`	`64`	`-----`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -287,3 +287,18 @@ def test_root_locus_documentation(savefigs=False):`
`287`	`287`
`288`	`288`	`# Run tests that generate plots for the documentation`
`289`	`289`	`test_root_locus_documentation(savefigs=True)`
	`290`	`+`
	`291`	`+`
	`292`	`+# https://github.com/python-control/python-control/issues/1063`
	`293`	`+deftest_rlocus_singleton():`
	`294`	`+# Generate a root locus map for a singleton`
	`295`	`+L=ct.tf([1,1], [1,2,3])`
	`296`	`+rldata=ct.root_locus_map(L,1)`
	`297`	`+np.testing.assert_equal(rldata.gains,np.array([1]))`
	`298`	`+assertrldata.loci.shape== (1,2)`
	`299`	`+`
	`300`	`+# Generate the root locus plot (no loci)`
	`301`	`+cplt=rldata.plot()`
	`302`	`+assertlen(cplt.lines[0,0])==1# poles (one set of markers)`
	`303`	`+assertlen(cplt.lines[0,1])==1# zeros`
	`304`	`+assertlen(cplt.lines[0,2])==2# loci (two 0-length lines)`

Comments

(0)