Commitaaa2aba

committed

fix bug in root_locus_plot identified by@NikolaiVChr in issue#1016

1 parentfeeb56a commitaaa2abaCopy full SHA for aaa2aba

File tree

-7

lines changed

-7

lines changed

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -496,19 +496,17 @@ def _find_root_locus_gain(event, sys, ax):`
`496`	`496`	`# Get the current axis limits to set various thresholds`
`497`	`497`	`xlim,ylim=ax.get_xlim(),ax.get_ylim()`
`498`	`498`
`499`		`-# Catch type error when event click is in the figure but notin an axis`
	`499`	`+# Catch type error when event click is in the figure but noton curve`
`500`	`500`	`try:`
`501`	`501`	`s=complex(event.xdata,event.ydata)`
`502`	`502`	`K=-1./sys(s)`
`503`	`503`	`K_xlim=-1./sys(`
`504`	`504`	`complex(event.xdata+0.05*abs(xlim[1]-xlim[0]),event.ydata))`
`505`	`505`	`K_ylim=-1./sys(`
`506`	`506`	`complex(event.xdata,event.ydata+0.05*abs(ylim[1]-ylim[0])))`
`507`		`-`
`508`	`507`	`exceptTypeError:`
`509`		`-K=float('inf')`
`510`		`-K_xlim=float('inf')`
`511`		`-K_ylim=float('inf')`
	`508`	`+K,s=float('inf'),None`
	`509`	`+K_xlim=K_ylim=float('inf')`
`512`	`510`
`513`	`511`	`#`
`514`	`512`	`# Compute tolerances for deciding if we clicked on the root locus`
`@@ -526,9 +524,8 @@ def _find_root_locus_gain(event, sys, ax):`
`526`	`524`	`ifabs(K.real)>1e-8andabs(K.imag/K.real)<gain_toleranceand \`
`527`	`525`	`event.inaxes==ax.axesandK.real>0.:`
`528`	`526`	`returnK.real,s`
`529`		`-`
`530`	`527`	`else:`
`531`		`-returnNone,s`
	`528`	`+returnNone,None`
`532`	`529`
`533`	`530`
`534`	`531`	`# Mark points corresponding to a given gain on root locus plot`

Comments

(0)