Skip to content

Freqplot improvements #522

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
sawyerbfuller merged 23 commits into from
Feb 1, 2021
Merged

Freqplot improvements #522

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bab9f7b
removed backspace character in margins plot title because it shows as…
sawyerbfuller Jan 28, 2021
72c5e06
evalfr(sys,s) -> sys(s); mimo errors specified as ControlMIMONotImple…
sawyerbfuller Jan 28, 2021
ddaeb6d
freqplot: use reasonable number of frequency points rather than defau…
sawyerbfuller Jan 28, 2021
70c9855
convert first system passed to append into ss if necessary
sawyerbfuller Jan 28, 2021
65171d3
a few small code cleanups
sawyerbfuller Jan 28, 2021
060b2f0
fixes to pass tests
sawyerbfuller Jan 28, 2021
151fb6c
removed backspace character in margins plot title because it shows as…
sawyerbfuller Jan 28, 2021
ee6a72e
evalfr(sys,s) -> sys(s); mimo errors specified as ControlMIMONotImple…
sawyerbfuller Jan 28, 2021
1c0764d
freqplot: use reasonable number of frequency points rather than defau…
sawyerbfuller Jan 28, 2021
08dfca5
convert first system passed to append into ss if necessary
sawyerbfuller Jan 28, 2021
d8b70ed
a few small code cleanups
sawyerbfuller Jan 28, 2021
5e3c2bb
fixes to pass tests
sawyerbfuller Jan 28, 2021
b9a350e
Merge branch 'freqplot-improvements' of https://github.com/sawyerbful…
sawyerbfuller Jan 28, 2021
41193c6
test bug, changed is to ==
sawyerbfuller Jan 28, 2021
d195e06
revert some freqplot.nyquist_plot changes because they turned out to …
sawyerbfuller Jan 28, 2021
eaf5b16
docstring fixes, nyquist now outputs frequency response as specified …
sawyerbfuller Jan 29, 2021
e8d233f
added a few unit tests for frequency range parameter to nyquist and bode
sawyerbfuller Jan 29, 2021
fa43785
plot vertical nyquist freq line at same time as data for legend conve…
sawyerbfuller Jan 29, 2021
adec95e
Update control/freqplot.py
sawyerbfuller Jan 29, 2021
b7653f8
Update control/freqplot.py
sawyerbfuller Jan 29, 2021
acaea54
@murrayrm suggested changes e.g change default_frequency_range to pri…
sawyerbfuller Jan 29, 2021
24d57e1
Merge branch 'freqplot-improvements' of https://github.com/sawyerbful…
sawyerbfuller Jan 29, 2021
73ce1a6
allow specified frequency range to exceed nyquist frequency if desired
sawyerbfuller Jan 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
Prev Previous commit
Next Next commit
convert first system passed to append into ss if necessary
  • Loading branch information
@sawyerbfuller
sawyerbfuller committed Jan 28, 2021
commit 08dfca560cc4d3029023dfc35e2e3532c7508943
6 changes: 5 additions & 1 deletion control/bdalg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
"""

import numpy as np
from scipy.signal.ltisys import StateSpace
Comment thread
sawyerbfuller marked this conversation as resolved.
Outdated
from . import xferfcn as tf
from . import statesp as ss
from . import frdata as frd
Expand Down Expand Up @@ -280,7 +281,10 @@ def append(*sys):
>>> sys = append(sys1, sys2)

"""
s1 = sys[0]
if not isinstance(sys[0], StateSpace):
Comment thread
sawyerbfuller marked this conversation as resolved.
Outdated
s1 = ss._convert_to_statespace(sys[0])
Comment thread
sawyerbfuller marked this conversation as resolved.
Outdated
else:
s1 = sys[0]
for s in sys[1:]:
s1 = s1.append(s)
return s1
Expand Down