Skip to content

use __call__ instead of evalfr in lti system classes #449

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 36 commits into from
Jan 8, 2021
Merged

use __call__ instead of evalfr in lti system classes #449

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1a6d806
eliminate _evalfr in lti system classes, replaced with __call__, whic…
sawyerbfuller Aug 14, 2020
b05492c
fixed remaining failing unit tests and cleanup of docfiles
sawyerbfuller Aug 16, 2020
2c4ac62
minor fix following suggested change in frd str method
sawyerbfuller Aug 16, 2020
6213a54
fixed a few bugs that slipped through
sawyerbfuller Aug 16, 2020
8486b7a
Update control/frdata.py
sawyerbfuller Aug 17, 2020
c8bf92f
Update control/frdata.py
sawyerbfuller Aug 17, 2020
371986c
Update control/lti.py
sawyerbfuller Aug 17, 2020
d8fbaa0
Update control/statesp.py
sawyerbfuller Aug 17, 2020
17bc2a8
Apply suggestions from code review
sawyerbfuller Aug 17, 2020
4ad33db
suggested changes in docstrings
sawyerbfuller Aug 17, 2020
94322c8
Merge remote-tracking branch 'origin/call-method' into call-method
sawyerbfuller Aug 17, 2020
60433e0
better docstrings conforming to numpydoc
sawyerbfuller Aug 17, 2020
262fde6
converted statesp.horner to take care of trying to use slycot_horner …
sawyerbfuller Aug 17, 2020
4c3ed0b
renamed slycot_horner to slycot_laub
sawyerbfuller Aug 17, 2020
b37c16b
docs more consistent
sawyerbfuller Aug 17, 2020
4e4b97f
forgot to change a variable name everywhere in a function
sawyerbfuller Aug 17, 2020
5626a3a
revert doc/control.rst
bnavigator Aug 18, 2020
5caffa4
Update control/xferfcn.py
sawyerbfuller Aug 19, 2020
c888b6e
numpydoc convention updates
sawyerbfuller Aug 19, 2020
b64145d
small update to facilitate merge maybe
sawyerbfuller Aug 19, 2020
3cf80af
small numpydoc change in trasnferfunction to resolve merge
sawyerbfuller Aug 19, 2020
330e517
unit tests now test for deprecation of sys.freqresp
sawyerbfuller Aug 19, 2020
8c9571d
Merge branch 'master' into call-method
sawyerbfuller Aug 19, 2020
195bec3
rebase sawyerbfuller-call-method against master
murrayrm Jan 6, 2021
6b82c3c
Merge commit '195bec3' into call-method-mergeinto
bnavigator Jan 6, 2021
bddc792
fix merge strategy 'errors'
bnavigator Jan 6, 2021
e9bff6a
restore test_phase_crossover_frequencies_mimo
bnavigator Jan 6, 2021
73fc6a6
reinstate second check in frd_test test_eval()
bnavigator Jan 6, 2021
7acfc77
statesp_test: rename from test_evalfr to test_call
bnavigator Jan 6, 2021
a26520d
statesp_test: remove duplicate test_pole_static and test_copy_constru…
bnavigator Jan 6, 2021
dae8d42
Update control/xferfcn.py
sawyerbfuller Jan 6, 2021
3b10af0
check for warning the pytest way
bnavigator Jan 6, 2021
1bf445b
add unit tests for freqresp/evalfr warnings/errors
murrayrm Jan 7, 2021
3dbaacd
test frd freqresp deprecation
bnavigator Jan 7, 2021
178bfa0
doc updates to specify frequency response outputs more precisely
sawyerbfuller Jan 7, 2021
a631098
missed a couple of doc updates in xferfcn
sawyerbfuller Jan 7, 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
check for warning the pytest way
  • Loading branch information
@bnavigator
bnavigator committed Jan 6, 2021
commit 3b10af001bf07644062c0c2da0067bc501cd3eff
9 changes: 1 addition & 8 deletions control/tests/xferfcn_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,15 +474,8 @@ def test_call_mimo(self):
def test_freqresp_deprecated(self):
sys = TransferFunction([1., 3., 5], [1., 6., 2., -1.])
# Deprecated version of the call (should generate warning)
import warnings
with warnings.catch_warnings(record=True) as w:
# Set up warnings filter to only show warnings in control module
warnings.filterwarnings("ignore")
warnings.filterwarnings("always", module="control")

# Make sure that we get a pending deprecation warning
with pytest.warns(DeprecationWarning):
sys.freqresp(1.)
assert issubclass(w[-1].category, DeprecationWarning)

def test_frequency_response_siso(self):
"""Evaluate the magnitude and phase of a SISO system at
Expand Down