Skip to content

a first implementation of the singular value plot as discussed in #592 #593

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
merged 37 commits into from
Apr 29, 2021
Merged

a first implementation of the singular value plot as discussed in #592 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
43e3779
DEV:
forgi86 Mar 27, 2021
ae7d546
Update control/freqplot.py
forgi86 Mar 28, 2021
36e8b77
Update control/freqplot.py
forgi86 Mar 28, 2021
4e055bb
FIX:
forgi86 Mar 28, 2021
14ef194
Merge remote-tracking branch 'origin/singular-values-plot' into singu…
forgi86 Mar 28, 2021
681edb7
FIX:
forgi86 Mar 28, 2021
8d02fae
FIX:
forgi86 Mar 28, 2021
fe97069
FIX:
forgi86 Mar 28, 2021
762fbd6
FIX: development of parametrized tests for the singular_values_plot f…
forgi86 Mar 31, 2021
3b09ae7
FIX: using option squeeze=False to keep all dimensions from the frequ…
forgi86 Mar 31, 2021
9c68700
FIX:
forgi86 Mar 31, 2021
a392c97
DOC:
forgi86 Mar 31, 2021
caa3e2c
FIX:
forgi86 Mar 31, 2021
0607314
FIX:
forgi86 Mar 31, 2021
65b4e49
TST:
forgi86 Mar 31, 2021
87d48ab
TST:
forgi86 Apr 1, 2021
a289f8c
MAINT: refactoring of the frequency selection logic as a private func…
forgi86 Apr 1, 2021
fbafc6c
FIX: added missing omega vector in test system ss_siso_ct
forgi86 Apr 2, 2021
7f5d66c
TST:
forgi86 Apr 2, 2021
81f9ee7
TST: added a test condition that expects the warning to be issued whe…
forgi86 Apr 2, 2021
7d19b30
MAINT:
forgi86 Apr 3, 2021
34c3826
DOC: updated example for singular_values_plot
forgi86 Apr 7, 2021
48015d5
MAINT: _bode_defaults removed, fields moved in _freqplot_default
forgi86 Apr 7, 2021
38dfeda
MAINT: no warning issued for evaluation above the Nyquist frequency
forgi86 Apr 7, 2021
555902b
MAINT: removing references to singular_values_plot configurations
forgi86 Apr 7, 2021
ec69337
MAINT: removing references to singular_values_plot configurations
forgi86 Apr 7, 2021
288a7ee
MAINT: removing references to bode configurations (use freqplot instead)
forgi86 Apr 7, 2021
8f3f76d
Update control/freqplot.py
forgi86 Apr 7, 2021
fb3d9a0
MAINT: the Hz parameter of bode_plot and singular_values_plot now onl…
forgi86 Apr 18, 2021
37c0962
DOC: bode changed to freqplot in conventions.rst
forgi86 Apr 18, 2021
a486c18
Merge remote-tracking branch 'origin/singular-values-plot' into singu…
forgi86 Apr 18, 2021
9143d75
Merge branch 'master' into singular-values-plot
forgi86 Apr 18, 2021
f5de343
DOC: modified docstring (Examples section) in singular_values_plot to…
forgi86 Apr 23, 2021
9638e92
DOC: modified docstring (Examples section) in singular_values_plot to…
forgi86 Apr 23, 2021
10cde40
DOC: modified docstring (Examples section) in singular_values_plot to…
forgi86 Apr 23, 2021
0ada3f6
DOC: modified imports in docstring (Examples section) in singular_val…
forgi86 Apr 24, 2021
649c394
Merge branch 'master' into pr-593
bnavigator Apr 29, 2021
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
8 changes: 4 additions & 4 deletions control/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ def reset_defaults():
# System level defaults
defaults.update(_control_defaults)

from .freqplot import _bode_defaults, _freqplot_defaults, _nyquist_defaults
defaults.update(_bode_defaults)
from .freqplot import _freqplot_defaults, _nyquist_defaults
defaults.update(_freqplot_defaults)
defaults.update(_nyquist_defaults)

Expand Down Expand Up @@ -133,7 +132,7 @@ def use_matlab_defaults():
* State space class and functions use Numpy matrix objects

"""
set_defaults('bode', dB=True, deg=True, Hz=False, grid=True)
set_defaults('freqplot', dB=True, deg=True, Hz=False, grid=True)
set_defaults('statesp', use_numpy_matrix=True)


Expand All @@ -147,7 +146,7 @@ def use_fbs_defaults():
* Nyquist plots use dashed lines for mirror image of Nyquist curve

"""
set_defaults('bode', dB=False, deg=True, Hz=False, grid=False)
set_defaults('freqplot', dB=False, deg=True, Hz=False, grid=False)
set_defaults('nyquist', mirror_style='--')


Expand Down Expand Up @@ -179,6 +178,7 @@ class and functions. If flat is `False`, then matrices are
stacklevel=2, category=DeprecationWarning)
set_defaults('statesp', use_numpy_matrix=flag)


def use_legacy_defaults(version):
""" Sets the defaults to whatever they were in a given release.

Expand Down
Loading