Skip to content

bode-plot #69

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 14 commits into from
May 30, 2016
Merged

bode-plot #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6d9d119
bode_plot: allow omega be specified by boundaries (min, max)
marthoch Jun 29, 2015
a2c4269
bode_plot:
marthoch Jul 3, 2015
c2c7381
bode_plot: worked on frequency range
marthoch Jul 5, 2015
f2c40e6
Added handling of bode_plot frequency limits for discrete systems.
marthoch Aug 16, 2015
ea67935
Added example as ipython notebook.
martinup Aug 17, 2015
5d56788
some cleanup in bode-plot and bode-plot example
martinup Aug 18, 2015
623ca94
Changed implementation of the limitation of evaluated frequencies for
martinup Aug 19, 2015
810287e
Merge remote-tracking branch 'python-control/master'
martinup Aug 21, 2015
3959f58
change order of argument to ensure backward compatibility
martinup Sep 5, 2015
64c9adb
fix documentation, spelling, order
martinup Sep 5, 2015
f07ef5a
complete documentation of default_frequency_range
martinup Sep 5, 2015
9e408b9
instead of using omege to define a frequency interval oInstead of usi…
martinup Sep 5, 2015
e2e24a5
add NotImplementedError in empty case
martinup Sep 5, 2015
3b6de2f
reworked feature selection for discrete systems
martinup Sep 7, 2015
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
some cleanup in bode-plot and bode-plot example
  • Loading branch information
@martinup
martinup committed Aug 18, 2015
commit 5d56788467bf82cbe3a5222573633aeca1c7619a
11 changes: 5 additions & 6 deletions control/freqplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def bode_plot(syslist, omega=None, omega_num=None, dB=None, Hz=None, deg=None,
omegas.append(omega_sys)
nyquistfrqs.append(nyquistfrq)
# Get the dimensions of the current axis, which we will divide up
# ! TODO: Not current implemented; just use subplot for now
#! TODO: Not current implemented; just use subplot for now

if (Plot):
# Magnitude plot
Expand Down Expand Up @@ -257,7 +257,6 @@ def nyquist_plot(syslist, omega=None, Plot=True, color='b',

# Select a default range if none is provided
if omega is None:
# ! TODO: think about doing something smarter for discrete
omega = default_frequency_range(syslist)

# Interpolate between wmin and wmax if a tuple or list are provided
Expand Down Expand Up @@ -314,7 +313,7 @@ def nyquist_plot(syslist, omega=None, Plot=True, color='b',
return x, y, omega

# Gang of Four
# ! TODO: think about how (and whether) to handle lists of systems
#! TODO: think about how (and whether) to handle lists of systems
def gangof4_plot(P, C, omega=None):
"""Plot the "Gang of 4" transfer functions for a system

Expand All @@ -338,7 +337,7 @@ def gangof4_plot(P, C, omega=None):
else:

# Select a default range if none is provided
# ! TODO: This needs to be made more intelligent
#! TODO: This needs to be made more intelligent
if omega is None:
omega = default_frequency_range((P, C))

Expand All @@ -348,7 +347,7 @@ def gangof4_plot(P, C, omega=None):
T = L * S;

# Plot the four sensitivity functions
# ! TODO: Need to add in the mag = 1 lines
#! TODO: Need to add in the mag = 1 lines
mag_tmp, phase_tmp, omega = T.freqresp(omega);
mag = np.squeeze(mag_tmp)
phase = np.squeeze(phase_tmp)
Expand Down Expand Up @@ -466,7 +465,7 @@ def default_frequency_range(syslist, Hz=None, number_of_samples=None, feature_pe
lsp_min = min(lsp_min, np.log10(min(freq_interesting)))
lsp_max = max(lsp_max, np.log10(max(freq_interesting)))

# ! TODO: Add a check in discrete case to make sure we don't get aliasing (Attention: there is a list of system but only one omega vector)
#! TODO: Add a check in discrete case to make sure we don't get aliasing (Attention: there is a list of system but only one omega vector)

# Set the range to be an order of magnitude beyond any features
if number_of_samples:
Expand Down
Loading