Allow unit tests to run without slycot#122
Merged
slivingston merged 4 commits intopython-control:masterfrom Dec 31, 2016
Merged
Allow unit tests to run without slycot#122slivingston merged 4 commits intopython-control:masterfrom
slivingston merged 4 commits intopython-control:masterfrom
Conversation
|
Changes Unknown when pulling cab850a on murrayrm:noslycot into ** on python-control:master**. |
|
Changes Unknown when pulling c90a399 on murrayrm:noslycot into ** on python-control:master**. |
slivingston
reviewed
Dec 31, 2016
control/tests/convert_test.py
Outdated
|
|
||
| # Set up a transfer function (should always work) | ||
| tfcn = control.tf([[[-235, 1.146e4], | ||
| [-235, 1.146E4], |
Member
There was a problem hiding this comment.
Indentation here and on the next 4 lines seems to be slightly off. I recommend
tfcn = control.tf([[[-235, 1.146e4],
[-235, 1.146E4],
[-235, 1.146E4, 0]]],
[[[1, 48.78, 0],
[1, 48.78, 0, 0],
[0.008, 1.39, 48.78]]])
|
Changes Unknown when pulling 7de3cc8 on murrayrm:noslycot into ** on python-control:master**. |
Member
|
For future work, I think that it would be useful to either:
|
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
3 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 provides updates to allow unit tests to run correctly when
slycotis not installed. There is also a change inxferfcn.pyto allow proper creation of transfer functions when num or den is a 0d ndarray. This can occur whenslycotis not installed due to a difference in the way that transfer functions are created from state space matrices inxferfcn._convertToTransferFunction()whenslycotis not available.