Skip to content

Update frequency response plots to use _response/_plot pattern #924

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 17 commits into from
Sep 16, 2023
Merged

Update frequency response plots to use _response/_plot pattern #924

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aef709c
initial refactoring of bode_plot
murrayrm Jul 1, 2023
530d689
update sisotool to use ax for bode_plot
murrayrm Jul 4, 2023
c3ebbda
updated bode_plot titling + MIMO implementation
murrayrm Jul 4, 2023
a7e9951
gangof4 refactoring into response/plot + related bode_plot changes
murrayrm Jul 7, 2023
949dcaf
updated nyquist limit lines for dtime systems
murrayrm Jul 13, 2023
4dbb0cb
refactor singular_values_plot into response/plot
murrayrm Jul 15, 2023
2d6a779
implement FrequencyResponseList class with plot() method
murrayrm Jul 16, 2023
6ce29da
TMP: update margins processing (display_margins)
murrayrm Jul 16, 2023
d07422d
update plot handling to allow system arguments
murrayrm Jul 16, 2023
e5360dc
refactoring of nyquist into response/plot + updated unit tests, examples
murrayrm Jul 16, 2023
83c9e4e
refactoring of describing_function_plot in response/plot + updated un…
murrayrm Jul 19, 2023
9bc5d71
regularize sysdata/list processing + small refactor + updated example
murrayrm Jul 21, 2023
f865c8c
updated docstrings, userdocs + fixes along the way
murrayrm Jul 22, 2023
c3cc504
updated unit tests
murrayrm Jul 22, 2023
33ca68b
refactoring of nichols into response/plot + updated unit tests, examples
murrayrm Jul 22, 2023
9e326dd
add frequency_limit and line style processing + unit tests, fixes
murrayrm Jul 23, 2023
8e84d00
code style and docstring tweaks
murrayrm Aug 3, 2023
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
Next Next commit
initial refactoring of bode_plot
  • Loading branch information
@murrayrm
murrayrm committed Sep 16, 2023
commit aef709cda19495ba3968454bbca6cbfca0fbcd71
12 changes: 10 additions & 2 deletions control/frdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

from .lti import LTI, _process_frequency_response
from .exception import pandas_check
from .iosys import InputOutputSystem, _process_iosys_keywords
from .iosys import InputOutputSystem, _process_iosys_keywords, common_timebase
from . import config

__all__ = ['FrequencyResponseData', 'FRD', 'frd']
Expand Down Expand Up @@ -93,6 +93,8 @@ class FrequencyResponseData(LTI):
fresp : 3D array
Frequency response, indexed by output index, input index, and
frequency point.
dt : float, True, or None
System timebase.

Notes
-----
Expand Down Expand Up @@ -169,6 +171,7 @@ def __init__(self, *args, **kwargs):
else:
z = np.exp(1j * self.omega * otherlti.dt)
self.fresp = otherlti(z, squeeze=False)
arg_dt = otherlti.dt

else:
# The user provided a response and a freq vector
Expand All @@ -182,6 +185,7 @@ def __init__(self, *args, **kwargs):
"The frequency data constructor needs a 1-d or 3-d"
" response data array and a matching frequency vector"
" size")
arg_dt = None

elif len(args) == 1:
# Use the copy constructor.
Expand All @@ -191,6 +195,8 @@ def __init__(self, *args, **kwargs):
" an FRD object. Received %s." % type(args[0]))
self.omega = args[0].omega
self.fresp = args[0].fresp
arg_dt = args[0].dt

else:
raise ValueError(
"Needs 1 or 2 arguments; received %i." % len(args))
Expand All @@ -210,9 +216,11 @@ def __init__(self, *args, **kwargs):

# Process iosys keywords
defaults = {
'inputs': self.fresp.shape[1], 'outputs': self.fresp.shape[0]}
'inputs': self.fresp.shape[1], 'outputs': self.fresp.shape[0],
'dt': None}
name, inputs, outputs, states, dt = _process_iosys_keywords(
kwargs, defaults, end=True)
dt = common_timebase(dt, arg_dt) # choose compatible timebase

# Process signal names
InputOutputSystem.__init__(
Expand Down
Loading