Skip to content

Fix plot issues #382

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 7 commits into from
Mar 25, 2020
Merged

Fix plot issues #382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4f86424
fix sgrid, zgrid to use existing axes if they exist + PEP8 cleanup
murrayrm Jan 20, 2020
1e6c363
change plot and print_gain keywords to lower case, with deprecation w…
murrayrm Jan 20, 2020
06c2b66
remove converstion to state space that was giving spurious zero at in…
murrayrm Jan 20, 2020
4450cf8
change plot and print_gain keywords to lower case, with deprecation w…
murrayrm Jan 20, 2020
dcf12fd
PEP8 cleanup
murrayrm Jan 20, 2020
249d85e
use Hz=False for MATLAB + docstring corrections
murrayrm Mar 21, 2020
4267eea
labelFreq -> label_freq in nyquist_plot() w/ deprecation warning + re…
murrayrm Mar 22, 2020
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
use Hz=False for MATLAB + docstring corrections
  • Loading branch information
@murrayrm
murrayrm committed Mar 21, 2020
commit 249d85e854e76c40e8b0cafdc4a6a4108ae7dcce
6 changes: 3 additions & 3 deletions control/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ def use_matlab_defaults():

The following conventions are used:
* Bode plots plot gain in dB, phase in degrees, frequency in
Hertz, with grids
rad/sec, with grids
* State space class and functions use Numpy matrix objects

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


Expand All @@ -128,7 +128,7 @@ def use_fbs_defaults():

The following conventions are used:
* Bode plots plot gain in powers of ten, phase in degrees,
frequency in Hertz, no grid
frequency in rad/sec, no grid

"""
set_defaults('bode', dB=False, deg=True, Hz=False, grid=False)
Expand Down
8 changes: 4 additions & 4 deletions control/tests/config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def test_matlab_bode(self):
mag_data = mag_line[0].get_data()
mag_x, mag_y = mag_data

# Make sure the x-axis is in Hertz and y-axis is in dB
np.testing.assert_almost_equal(mag_x[0], 0.001 / (2*pi), decimal=6)
# Make sure the x-axis is in rad/sec and y-axis is in dB
np.testing.assert_almost_equal(mag_x[0], 0.001, decimal=6)
np.testing.assert_almost_equal(mag_y[0], 20*log10(10), decimal=3)

# Get the phase line
Expand All @@ -117,8 +117,8 @@ def test_matlab_bode(self):
phase_data = phase_line[0].get_data()
phase_x, phase_y = phase_data

# Make sure the x-axis is in Hertz and y-axis is in degrees
np.testing.assert_almost_equal(phase_x[-1], 1000 / (2*pi), decimal=1)
# Make sure the x-axis is in rad/sec and y-axis is in degrees
np.testing.assert_almost_equal(phase_x[-1], 1000, decimal=1)
np.testing.assert_almost_equal(phase_y[-1], -180, decimal=0)

# Override the defaults and make sure that works as well
Expand Down