Skip to content

Frequency plot improvements #1011

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
murrayrm merged 18 commits into from
Jun 29, 2024
Merged

Frequency plot improvements #1011

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b9acc99
allow label keyword in bode_plot() to override default labels
murrayrm Jun 1, 2024
0b6348f
add label keyword to singular_value_plot and nyquist_plot
murrayrm Jun 1, 2024
606cf48
add additional tests for freqplot label override + small fixes
murrayrm Jun 2, 2024
5e405cc
don't strip common parts of labels if given explicitly
murrayrm Jun 4, 2024
eeebec3
BUG: indent_radius not handled properly when passed to nyquist_plot
murrayrm Jun 6, 2024
402b45f
restore [wmin, wmax] functionality + documentation updates
murrayrm Jun 9, 2024
6f6c70d
refactoring/regularization of ax keyword processing
murrayrm Jun 14, 2024
404fbdf
regularize processing of rcParams
murrayrm Jun 14, 2024
1a94f4e
add suptitle() function for better centered titles
murrayrm Jun 15, 2024
28995f1
updated freqplot documentation + figures
murrayrm Jun 15, 2024
ffb0a0f
move plotutil to ctrlplot
murrayrm Jun 15, 2024
4734912
update freq_label handling + add Bode/Nyquist notebook
murrayrm Jun 15, 2024
aeb187f
set up frd() as full factory function for FRD I/Osystems
murrayrm Jun 16, 2024
ddb5b7c
update unexpected keyword check for GitHub action variation
murrayrm Jun 16, 2024
2fde963
allowed Bode/Nyquist for mixed FRD systems
murrayrm Jun 16, 2024
b7c158b
update CDS 110 example
murrayrm Jun 26, 2024
59a676e
fix typos in doc, docstrings pointed out by @slivingston review
murrayrm Jun 29, 2024
343df2c
fix issues in examples/cds110_bode-nyquist.ipynb per @slivingston review
murrayrm Jun 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BUG: indent_radius not handled properly when passed to nyquist_plot
  • Loading branch information
@murrayrm
murrayrm committed Jun 26, 2024
commit eeebec32603586cbf4c7d682471b3181d6578784
8 changes: 5 additions & 3 deletions control/freqplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1536,9 +1536,6 @@ def nyquist_plot(
color : string, optional
Used to specify the color of the line and arrowhead.

return_contour : bool, optional
If 'True', return the contour used to evaluate the Nyquist plot.

**kwargs : :func:`matplotlib.pyplot.plot` keyword properties, optional
Additional keywords (passed to `matplotlib`)

Expand Down Expand Up @@ -1630,6 +1627,10 @@ def nyquist_plot(
max_curve_magnitude). Default linestyle (['-', '-.']) is
determined by config.defaults['nyquist.mirror_style'].

return_contour : bool, optional
(legacy) If 'True', return the encirclement count and Nyquist
contour used to generate the Nyquist plot.

start_marker : str, optional
Matplotlib marker to use to mark the starting point of the Nyquist
plot. Defaults value is 'o' and can be set using
Expand Down Expand Up @@ -1760,6 +1761,7 @@ def _parse_linestyle(style_name, allow_false=False):
omega_num=kwargs.pop('omega_num', None),
warn_encirclements=kwargs.pop('warn_encirclements', True),
warn_nyquist=kwargs.pop('warn_nyquist', True),
indent_radius=kwargs.pop('indent_radius', None),
check_kwargs=False, **kwargs)
else:
nyquist_responses = data
Expand Down
9 changes: 9 additions & 0 deletions control/tests/nyquist_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,15 @@ def test_nyquist_indent_do(indentsys):
np.testing.assert_allclose(contour[:50].real**2 + contour[:50].imag**2,
0.01**2)

# Make sure that the command also works if called directly as _plot()
plt.figure()
with pytest.warns(DeprecationWarning, match=".* use nyquist_response()"):
count, contour = ct.nyquist_plot(
indentsys, indent_radius=0.01, return_contour=True)
assert _Z(indentsys) == count + _P(indentsys)
np.testing.assert_allclose(
contour[:50].real**2 + contour[:50].imag**2, 0.01**2)


def test_nyquist_indent_left(indentsys):
plt.figure();
Expand Down