TransferFunction array priority plus system type conversion checking#498
Merged
murrayrm merged 12 commits intopython-control:masterfrom Jan 8, 2021
Merged
Conversation
Contributor
|
So, wait on #497?
On first glance, the test file looks good. |
Member
Author
|
I'll update #497 tonight and also do one more small change here (putting in the final table of conversations for later use). Once #497 is integrated, I'll make sure this is rebased against that (should be OK, I think, since I started with that as my initial branch) and then we can merge this one as well. |
bnavigator
reviewed
Jan 5, 2021
356189e to
06b7718
Compare
Co-authored-by: Ben Greiner <code@bnavigator.de>
06b7718 to
e910c22
Compare
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.
(This PR builds on #497, which is required for some of the functionality.)
This PR updates the
__array_priority__variable in the TransferFunction class that is used bynumpy, as described in issue #459. With this change, multiplying a transfer function by anndarrayobject gives a transfer function.I also created a new unit test (
control/tests/type_converstion_test.py) that goes through the matrix of interconnections in #497 and confirms that output type for each operation. In this current PR, no new functionality is included, but I did mark those entries that should (eventually) be updated. Depending on what people think about the PR, we can either leave those for another time or put them into this PR.