Skip to content

Add passivity module, ispassive function, and passivity_test. Introduces optional dependency cvxopt. #739

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
murrayrm merged 21 commits into from
Jun 16, 2022
Merged

Add passivity module, ispassive function, and passivity_test. Introduces optional dependency cvxopt. #739

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e8e87a4
Add passivity module, is_passive function, and passivity_test.
May 31, 2022
2eef661
Remove dependancies on lmi-sdp and sympy for is_passive.
Jun 6, 2022
147a24e
Use sys.nstates in stead of using A.shape[0]
Jun 6, 2022
fdb2d4a
Attempt to setup cvxopt similar to slycot.
Jun 6, 2022
dc46f3c
Remove unused import.
Mark-Yeatman Jun 7, 2022
0ecc135
Apply suggestions from code review
Mark-Yeatman Jun 7, 2022
649b21e
Update passivity.py
Mark-Yeatman Jun 7, 2022
b73e6fe
Address some review comments.
Jun 13, 2022
cd7ec0f
Update control/passivity.py
Mark-Yeatman Jun 13, 2022
d65f1d2
Remove duplicate "print" statement.
Jun 13, 2022
7e79c82
Fix grammar in doc string.
Jun 13, 2022
c57b928
Another grammar in doc string fix.
Jun 13, 2022
27487a9
Address edge case of stricly proper systems.
Jun 14, 2022
d6916c6
Expand unit tests, add info to doc string for parameters and returns,…
Jun 14, 2022
bb16be0
Parameterize unit tests. Catch edge case of A=0.
Mark-Yeatman Jun 14, 2022
cf0eac3
Run autopep8.
Mark-Yeatman Jun 14, 2022
7e47d80
Add wrapper like functionality for ispassive(), so that it can be cal…
Mark-Yeatman Jun 16, 2022
ce11d0b
mark the whole passivity_test module as skippable
bnavigator Jun 16, 2022
f7d74b2
Fix bug in tests and lti.py.
Jun 16, 2022
0c361df
Merge branch 'main' into passivity-tools
Mark-Yeatman Jun 16, 2022
c2255b0
Fix merge issue.
Jun 16, 2022
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
Next Next commit
Run autopep8.
  • Loading branch information
@Mark-Yeatman
Mark-Yeatman committed Jun 14, 2022
commit cf0eac302a71897424ba8eeffd6b591cfbe1cde0
4 changes: 2 additions & 2 deletions control/passivity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def make_LMI_matrix(P):
# crunch feasibility solution
cvx.solvers.options['show_progress'] = False
sol = cvx.solvers.sdp(c,
Gs=[cvx.matrix(coefficents)],
hs=[cvx.matrix(constants)])
Gs=[cvx.matrix(coefficents)],
hs=[cvx.matrix(constants)])

return (sol["x"] is not None)
19 changes: 11 additions & 8 deletions control/tests/passivity_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,23 @@ def test_ispassive():

assert(not passivity.ispassive(sys))


A_d = numpy.array([[-2, 0], [0, 0]])
A = numpy.array([[-3, 0], [0, -2]])
B = numpy.array([[0], [1]])
C = numpy.array([[-1, 2]])
D = numpy.array([[1.5]])


@cvxoptonly
@pytest.mark.parametrize(
"test_input,expected",
[((A,B,C,D*0.0), True),
((A_d,B,C,D), True),
((A*1e12,B,C,D*0), True),
((A,B*0,C*0,D), True),
((A*0,B,C,D), True),
((A*0,B*0,C*0,D*0), True)])
"test_input,expected",
[((A, B, C, D*0.0), True),
((A_d, B, C, D), True),
((A*1e12, B, C, D*0), True),
((A, B*0, C*0, D), True),
((A*0, B, C, D), True),
((A*0, B*0, C*0, D*0), True)])
def test_ispassive_edge_cases(test_input, expected):

# strictly proper
Expand All @@ -47,4 +50,4 @@ def test_ispassive_edge_cases(test_input, expected):
C = test_input[2]
D = test_input[3]
sys = ss(A, B, C, D)
assert(passivity.ispassive(sys)==expected)
assert(passivity.ispassive(sys) == expected)