Skip to content

Fix timebase bug in InterconnectedSystem (issue #754) #755

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
bnavigator merged 3 commits into from
Aug 6, 2022
Merged

Fix timebase bug in InterconnectedSystem (issue #754) #755

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f17c919
fix timebase bug in InterconnectedSystem (issue #754)
murrayrm Aug 4, 2022
3c13f2c
add additional checks for overriding timebase
murrayrm Aug 4, 2022
cf30479
added tests for dt=True case per @sawyerbfuller suggestion
murrayrm Aug 4, 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
add additional checks for overriding timebase
  • Loading branch information
@murrayrm
murrayrm committed Aug 6, 2022
commit 3c13f2c58eb17f37a95551a5171dc7c9ad45bd6b
25 changes: 25 additions & 0 deletions control/tests/timebase_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,28 @@ def test_composition(dt1, dt2, dt3, op, type):
else:
sys3 = op(sys1, sys2)
assert sys3.dt == dt3


@pytest.mark.parametrize("dt", [None, 0, 0.1])
def test_composition_override(dt):
# Define the system
A, B, C, D = [[1, 1], [0, 1]], [[0], [1]], [[1, 0]], 0
sys1 = ct.ss(A, B, C, D, None, inputs='u1', outputs='y1')
sys2 = ct.ss(A, B, C, D, None, inputs='y1', outputs='y2')

# Show that we can override the type
sys3 = ct.interconnect([sys1, sys2], inputs='u1', outputs='y2', dt=dt)
assert sys3.dt == dt

# Overriding the type with an inconsistent type generates an error
sys1 = ct.StateSpace(A, B, C, D, 0.1, inputs='u1', outputs='y1')
if dt != 0.1 and dt is not None:
with pytest.raises(ValueError, match="incompatible timebases"):
sys3 = ct.interconnect(
[sys1, sys2], inputs='u1', outputs='y2', dt=dt)

sys1 = ct.StateSpace(A, B, C, D, 0, inputs='u1', outputs='y1')
if dt != 0 and dt is not None:
with pytest.raises(ValueError, match="incompatible timebases"):
sys3 = ct.interconnect(
[sys1, sys2], inputs='u1', outputs='y2', dt=dt)