Skip to content

Fix statespace issues causing Travis CI failures #212

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
merged 2 commits into from
Jul 2, 2018
Merged

Fix statespace issues causing Travis CI failures #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aa1f77
turn off nonsquare zero unit test when slycot is not installed
murrayrm Jul 2, 2018
e6447ea
remove non-ASCII text from statesp.py comment (was causing Travis CI …
murrayrm Jul 2, 2018
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
5 changes: 3 additions & 2 deletions control/statesp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,8 +537,9 @@ def zero(self):
# from
# https://dspace.mit.edu/bitstream/handle/1721.1/841/P-0802-06587335.pdf.
# The QZ algorithm solves the generalized eigenvalue problem: given
# `L = [A, B; C, D]` and `M = [I_nxn 0]`, find all finite λ for
# which there exist nontrivial solutions of the equation `Lz - λMz`.
# `L = [A, B; C, D]` and `M = [I_nxn 0]`, find all finite lambda
# for which there exist nontrivial solutions of the equation
# `Lz - lamba Mz`.
#
# The generalized eigenvalue problem is only solvable if its
# arguments are square matrices.
Expand Down
3 changes: 2 additions & 1 deletion control/tests/statesp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ def testPole(self):

np.testing.assert_array_almost_equal(p, true_p)

def testZero(self):
@unittest.skipIf(not slycot_check(), "slycot not installed")
def testMIMOZero_nonsquare(self):
"""Evaluate the zeros of a MIMO system."""

z = np.sort(self.sys1.zero())
Expand Down