Remove repr_format mentions; fix xferfcn static check per @slivingston

murrayrm · murrayrm · commit bf191936e5e5 · 2025-01-04T08:42:12.000-08:00
diff --git a/control/iosys.py b/control/iosys.py
@@ -151,8 +151,6 @@ class InputOutputSystem(object):
         the index of the corresponding array.
     input_labels, output_labels, state_labels : list of str
         List of signal names for inputs, outputs, and states.
-    repr_format : str
-        String representation format ('iosys' or 'loadable').
     shape : tuple
         2-tuple of I/O system dimension, (noutputs, ninputs).
 
diff --git a/control/tests/docstrings_test.py b/control/tests/docstrings_test.py
@@ -325,7 +325,6 @@ def test_deprecated_functions(module, prefix):
 # List of attributes defined in a parent class (no need to warn)
 iosys_parent_attributes = [
     'input_index', 'output_index', 'state_index',       # rarely used
-    'repr_format',                                      # rarely used
     'states', 'nstates', 'state_labels',                # not need in TF, FRD
     'params', 'outfcn', 'updfcn'                        # NL I/O, SS overlap
 ]
diff --git a/control/tests/xferfcn_test.py b/control/tests/xferfcn_test.py
@@ -30,14 +30,6 @@ class TestXferFcn:
 
     def test_constructor_bad_input_type(self):
         """Give the constructor invalid input types."""
-        # MIMO requires lists of lists of vectors (not lists of vectors)
-        # 13 Dec 2024: This now works correctly: creates static array (as tf)
-        # with pytest.raises(TypeError):
-        #     TransferFunction([[0., 1.], [2., 3.]], [[5., 2.], [3., 0.]])
-        # good input
-        TransferFunction([[[0., 1.], [2., 3.]]],
-                         [[[5., 2.], [3., 0.]]])
-
         # Single argument of the wrong type
         with pytest.raises(TypeError):
             TransferFunction([1])
diff --git a/control/xferfcn.py b/control/xferfcn.py
@@ -223,6 +223,9 @@ def __init__(self, *args, **kwargs):
             for poly in np.nditer(arr, flags=['refs_ok']):
                 if poly.item().size > 1:
                     static = False
+                    break
+            if not static:
+                break
 
         defaults = args[0] if len(args) == 1 else \
             {'inputs': num.shape[1], 'outputs': num.shape[0]}

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,6 @@ def test_deprecated_functions(module, prefix):`
`325`	`325`	`# List of attributes defined in a parent class (no need to warn)`
`326`	`326`	`iosys_parent_attributes = [`
`327`	`327`	`'input_index', 'output_index', 'state_index', # rarely used`
`328`		`- 'repr_format', # rarely used`
`329`	`328`	`'states', 'nstates', 'state_labels', # not need in TF, FRD`
`330`	`329`	`'params', 'outfcn', 'updfcn' # NL I/O, SS overlap`
`331`	`330`	`]`