Skip to content

Discrete omega-damping plot and tweaks #193

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 5 commits into from
Dec 28, 2018
Merged

Discrete omega-damping plot and tweaks #193

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dc8410c
Added discrete grid to pzmap function.
Feb 19, 2018
4117489
Revert "Added discrete grid to pzmap function."
Feb 19, 2018
f8c497e
Added discrete grid to pzmap function.
Feb 19, 2018
3d0bf03
Tweaked axis lines and zero/pole markers.
Feb 19, 2018
89dc937
Refactored sgrid based on matplotlib projections and moved sgrid and …
Mar 11, 2018
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
Revert "Added discrete grid to pzmap function." 
This reverts commit dc8410c
  • Loading branch information
Victor
Victor committed Feb 19, 2018
commit 4117489ec3128e25b65c3f4d7ab9c2bdb1d44038
4 changes: 2 additions & 2 deletions control/statesp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,10 +460,10 @@ def freqresp(self, omega):
if isdtime(self, strict=True):
dt = timebase(self)
cmplx_freqs = exp(1.j * omega * dt)
if ((omega * dt).any() > math.pi):
if ((omega * dt).any() > pi):
warn_message = ("evalfr: frequency evaluation"
" above Nyquist frequency")
warn(warn_message)
warnings.warn(warn_message)
else:
cmplx_freqs = omega * 1.j

Expand Down