Interpret str-type args to interconnect as non-sequence

roryyorke · roryyorke · commit 37d31480b682 · 2022-01-29T05:52:04.000+02:00
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.
diff --git 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
@@ -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}
