Rebased #431: Default dt is 0#490
Merged
bnavigator merged 14 commits intopython-control:masterfrom Dec 31, 2020
Merged
Conversation
…" from python-control#438 This reverts commit 2b98769.
…re that combines systems with different timebases
…s default system timebase
…tems, refactored __init__ on both to use it
This was
linked to
issues
Dec 31, 2020
Closed
bnavigator
changed the title
bnavigator
force-pushed
the
rebase-pr431
branch
from
d83ade4 to
8b82850
Compare
murrayrm
approved these changes
Dec 31, 2020
Member
murrayrm
left a comment
murrayrm
left a comment
There was a problem hiding this comment.
I look through the changes and these look good to me.
| TransferFunction.__add__(tsys.siso_tf1c, tsys.siso_tf1d) | ||
| with pytest.raises(ValueError): | ||
| TransferFunction.__add__(tsys.siso_tf1d, tsys.siso_tf2d) | ||
| with pytest.raises(ValueError): |
Contributor
There was a problem hiding this comment.
I assume these are removed because these tests are already performed above in eg ‘test_timenase_conversion’?
Contributor
Author
There was a problem hiding this comment.
They don't raise an error anymore. You had an equivalent change in #431. dt=0.1 and dt=True are compatible now.
| try: | ||
| dt = args[0].dt | ||
| except NameError: # pragma: no coverage | ||
| except AttributeError: |
sawyerbfuller
approved these changes
Dec 31, 2020
Contributor
Author
|
Added one more simple test in order to not uncover a line. The double dt resolver is documented behavior and thus should be checked. |
This was referenced Dec 31, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rebased version of #431. I had the updated tests already prepared in earlier versions of #438