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

Commitcf3daa4

committed

address@slivingston review comments

1 parent13eda42 commitcf3daa4Copy full SHA for cf3daa4

File tree

2 files changed

+11

-6

lines changed

control
- freqplot.py
- tests
  - nyquist_test.py

2 files changed

+11

-6

lines changed

`‎control/freqplot.py`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1885,6 +1885,11 @@ def _parse_linestyle(style_name, allow_false=False):`
`1885`	`1885`	`legend_loc,_,show_legend=_process_legend_keywords(`
`1886`	`1886`	`kwargs,None,'upper right')`
`1887`	`1887`
	`1888`	`+# Figure out where the blended curve should start`
	`1889`	`+ifblend_fraction<0orblend_fraction>1:`
	`1890`	`+raiseValueError("blend_fraction must be between 0 and 1")`
	`1891`	`+blend_curve_start= (1-blend_fraction)*max_curve_magnitude`
	`1892`	`+`
`1888`	`1893`	`# Create a list of lines for the output`
`1889`	`1894`	`out=np.empty((len(nyquist_responses),4),dtype=object)`
`1890`	`1895`	`foriinrange(len(nyquist_responses)):`
`@@ -1899,9 +1904,6 @@ def _parse_linestyle(style_name, allow_false=False):`
`1899`	`1904`	`splane_contour=np.log(response.contour)/response.dt`
`1900`	`1905`
`1901`	`1906`	`# Find the different portions of the curve (with scaled pts marked)`
`1902`		`-ifblend_fraction<0orblend_fraction>1:`
`1903`		`-raiseValueError("blend_fraction must be between 0 and 1")`
`1904`		`-blend_curve_start= (1-blend_fraction)*max_curve_magnitude`
`1905`	`1907`	`reg_mask=np.logical_or(`
`1906`	`1908`	`np.abs(resp)>blend_curve_start,`
`1907`	`1909`	`np.logical_not(np.isclose(splane_contour.real,0)))`
`@@ -1918,8 +1920,7 @@ def _parse_linestyle(style_name, allow_false=False):`
`1918`	`1920`	`abs_subset=np.abs(subset)`
`1919`	`1921`	`unit_vectors=subset/abs_subset# Preserve phase/direction`
`1920`	`1922`
`1921`		`-ifblend_curve_startisNoneor \`
`1922`		`-blend_curve_start==max_curve_magnitude:`
	`1923`	`+ifblend_curve_start==max_curve_magnitude:`
`1923`	`1924`	`# Clip at max_curve_magnitude`
`1924`	`1925`	`resp[rescale_idx]=max_curve_magnitude*unit_vectors`
`1925`	`1926`	`else:`

`‎control/tests/nyquist_test.py`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -646,7 +646,11 @@ def test_nyquist_rescale():`
`646`	`646`	`fromdatetimeimportdate`
`647`	`647`
`648`	`648`	`# Create the file to store figures`
`649`		`-git_info=subprocess.check_output(['git','describe'],text=True).strip()`
	`649`	`+try:`
	`650`	`+git_info=subprocess.check_output(`
	`651`	`+ ['git','describe'],text=True).strip()`
	`652`	`+exceptsubprocess.CalledProcessError:`
	`653`	`+git_info='UNKNOWN-REPO-INFO'`
`650`	`654`	`pdf=PdfPages(`
`651`	`655`	`f'nyquist_gallery-{git_info}-{date.today().isoformat()}.pdf')`
`652`	`656`

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!

Commitcf3daa4

File tree

2 files changed

2 files changed

`‎control/freqplot.py`

`‎control/tests/nyquist_test.py`

0 commit comments