From 37d31480b6828ba282af1e959fc94eb68a610b52 Mon Sep 17 00:00:00 2001 From: Rory Yorke Date: Sat, 29 Jan 2022 05:52:04 +0200 Subject: [PATCH] Interpret str-type args to `interconnect` as non-sequence If the arguments `inputs` or `outputs` (or their aliases `input` or `output`) are of type str, treat as a list containing that string. Fixes gh-692. --- control/iosys.py | 5 +++++ control/tests/interconnect_test.py | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/control/iosys.py b/control/iosys.py index c8e921c90..916fe9d6a 100644 --- a/control/iosys.py +++ b/control/iosys.py @@ -2519,6 +2519,11 @@ def interconnect(syslist, connections=None, inplist=[], outlist=[], # Use an empty connections list connections = [] + if isinstance(inputs, str): + inputs = [inputs] + if isinstance(outputs, str): + outputs = [outputs] + # If inplist/outlist is not present, try using inputs/outputs instead if not inplist and inputs is not None: inplist = list(inputs) diff --git a/control/tests/interconnect_test.py b/control/tests/interconnect_test.py index c927bf0f6..dd31241e7 100644 --- a/control/tests/interconnect_test.py +++ b/control/tests/interconnect_test.py @@ -210,3 +210,23 @@ def test_interconnect_exceptions(): with pytest.raises(TypeError, match="unknown parameter"): sumblk = ct.summing_junction(input_count=2, output_count=2) + + +def test_string_inputoutput(): + # regression test for gh-692 + P1 = ct.rss(2, 1, 1) + P1_iosys = ct.LinearIOSystem(P1, inputs='u1', outputs='y1') + P2 = ct.rss(2, 1, 1) + P2_iosys = ct.LinearIOSystem(P2, inputs='y1', outputs='y2') + + P_s1 = ct.interconnect([P1_iosys, P2_iosys], inputs='u1', outputs=['y2']) + assert P_s1.input_index == {'u1' : 0} + + P_s2 = ct.interconnect([P1_iosys, P2_iosys], input='u1', outputs=['y2']) + assert P_s2.input_index == {'u1' : 0} + + P_s1 = ct.interconnect([P1_iosys, P2_iosys], inputs=['u1'], outputs='y2') + assert P_s1.output_index == {'y2' : 0} + + P_s2 = ct.interconnect([P1_iosys, P2_iosys], inputs=['u1'], output='y2') + assert P_s2.output_index == {'y2' : 0} pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy