Skip to content

Allow unit tests to run without slycot #122

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
slivingston merged 4 commits into from
Dec 31, 2016
Merged

Allow unit tests to run without slycot #122

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
020734d
fix to init() to handle 0d arrays properly
murrayrm Dec 25, 2016
cab850a
update unit tests to skip anything requiring slycot if it is not inst…
murrayrm Dec 25, 2016
c90a399
added code to check for MIMO in statesp._convertToStateSpace + unit t…
murrayrm Dec 26, 2016
7de3cc8
TRV: adjusted indentation + removed trailing space
murrayrm Dec 31, 2016
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
TRV: adjusted indentation + removed trailing space
  • Loading branch information
@murrayrm
murrayrm committed Dec 31, 2016
commit 7de3cc8e0f03f9e4cef12e18a31e8132e11f0ffc
12 changes: 6 additions & 6 deletions control/tests/convert_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def setUp(self):
# Maximum number of states to test + 1
self.maxStates = 4
# Maximum number of inputs and outputs to test + 1
# If slycot is not installed, just check SISO
# If slycot is not installed, just check SISO
self.maxIO = 5 if slycot_check() else 2
# Set to True to print systems to the output.
self.debug = False
Expand Down Expand Up @@ -174,11 +174,11 @@ def testConvertMIMO(self):

# Set up a transfer function (should always work)
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]]])
[-235, 1.146E4],
[-235, 1.146E4, 0]]],
[[[1, 48.78, 0],
[1, 48.78, 0, 0],
[0.008, 1.39, 48.78]]])

# Convert to state space and look for an error
if (not slycot_check()):
Expand Down