add iosys.repr_show_count and defualt to True

Author: murrayrm

control/frdata.py

@@ -425,7 +425,7 @@ def _repr_eval_(self):
             smooth=(self._ifunc and ", smooth=True") or "")
 
         out += self._dt_repr()
-        if len(labels := self._label_repr(show_count=False)) > 0:
+        if len(labels := self._label_repr()) > 0:
             out += ",\n" + labels
 
         out += ")"

control/iosys.py

@@ -32,6 +32,7 @@
     'iosys.converted_system_name_prefix': '',
     'iosys.converted_system_name_suffix': '$converted',
     'iosys.repr_format': 'eval',
+    'iosys.repr_show_count': True,
 }
 
 
@@ -313,7 +314,9 @@ def repr_format(self):
     def repr_format(self, value):
         self._repr_format = value
 
-    def _label_repr(self, show_count=True):
+    def _label_repr(self, show_count=None):
+        show_count = config._get_param(
+            'iosys', 'repr_show_count', show_count, True)
         out, count = "", 0
 
         # Include the system name if not generic

control/statesp.py

@@ -394,7 +394,7 @@ def _repr_eval_(self):
             C=self.C.__repr__(), D=self.D.__repr__())
 
         out += super()._dt_repr(separator=",\n", space="")
-        if len(labels := super()._label_repr(show_count=False)) > 0:
+        if len(labels := super()._label_repr()) > 0:
             out += ",\n" + labels
 
         out += ")"

control/tests/frd_test.py

@@ -468,8 +468,9 @@ def test_repr_str(self):
         ref_common = "FrequencyResponseData(\n" \
             "array([[[1.  +0.j , 0.9 +0.1j, 0.1 +2.j , 0.05+3.j ]]]),\n" \
             "array([  0.1,   1. ,  10. , 100. ]),"
-        ref0 = ref_common + "\nname='sys0')"
-        ref1 = ref_common + " smooth=True," + "\nname='sys1')"
+        ref0 = ref_common + "\nname='sys0', outputs=1, inputs=1)"
+        ref1 = ref_common + " smooth=True," + \
+            "\nname='sys1', outputs=1, inputs=1)"
         sysm = ct.frd(
             np.matmul(array([[1], [2]]), sys0.fresp), sys0.omega, name='sysm')
 

control/tests/iosys_test.py

@@ -2290,32 +2290,31 @@ def test_signal_indexing():
 
 @slycotonly
 @pytest.mark.parametrize("fcn, spec, expected, missing", [
-    (ct.ss, {}, "", r"states|inputs|outputs|dt|name"),
-    (ct.tf, {}, "", r"states|inputs|outputs|dt|name"),
-    (ct.frd, {}, "", r"states|inputs|outputs|dt|name"),
-    (ct.ss, {'dt': 0.1}, ".*\ndt=0.1", r"states|inputs|outputs|name"),
-    (ct.tf, {'dt': 0.1}, ".*\ndt=0.1", r"states|inputs|outputs|name"),
-    (ct.frd, {'dt': 0.1},
-     ".*\ndt=0.1", r"states|inputs|outputs|name"),
-    (ct.ss, {'dt': True}, "\ndt=True", r"states|inputs|outputs|name"),
-    (ct.ss, {'dt': None}, "\ndt=None", r"states|inputs|outputs|name"),
-    (ct.ss, {'dt': 0}, "", r"states|inputs|outputs|dt|name"),
+    (ct.ss, {}, "states=4, outputs=3, inputs=2", r"dt|name"),
+    (ct.tf, {}, "outputs=3, inputs=2", r"dt|states|name"),
+    (ct.frd, {}, "outputs=3, inputs=2", r"dt|states|name"),
+    (ct.ss, {'dt': 0.1}, ".*\ndt=0.1,\nstates=4, outputs=3, inputs=2", r"name"),
+    (ct.tf, {'dt': 0.1}, ".*\ndt=0.1,\noutputs=3, inputs=2", r"states|name"),
+    (ct.frd, {'dt': 0.1}, ".*\ndt=0.1,\noutputs=3, inputs=2", r"states|name"),
+    (ct.ss, {'dt': True}, "\ndt=True,\nstates=4, outputs=3, inputs=2", r"name"),
+    (ct.ss, {'dt': None}, "\ndt=None,\nstates=4, outputs=3, inputs=2", r"name"),
+    (ct.ss, {'dt': 0}, "states=4, outputs=3, inputs=2", r"dt|name"),
     (ct.ss, {'name': 'mysys'}, "\nname='mysys'", r"dt"),
     (ct.tf, {'name': 'mysys'}, "\nname='mysys'", r"dt|states"),
     (ct.frd, {'name': 'mysys'}, "\nname='mysys'", r"dt|states"),
     (ct.ss, {'inputs': ['u1']},
-     r"[\n]inputs=\['u1'\]", r"states|outputs|dt|name"),
+     r"[\n]states=4, outputs=3, inputs=\['u1'\]", r"dt|name"),
     (ct.tf, {'inputs': ['u1']},
-     r"[\n]inputs=\['u1'\]", r"outputs|dt|name"),
+     r"[\n]outputs=3, inputs=\['u1'\]", r"dt|name"),
     (ct.frd, {'inputs': ['u1'], 'name': 'sampled'},
-     r"[\n]name='sampled', inputs=\['u1'\]", r"outputs|dt"),
+     r"[\n]name='sampled', outputs=3, inputs=\['u1'\]", r"dt"),
     (ct.ss, {'outputs': ['y1']},
-     r"[\n]outputs=\['y1'\]", r"states|inputs|dt|name"),
+     r"[\n]states=4, outputs=\['y1'\], inputs=2", r"dt|name"),
     (ct.ss, {'name': 'mysys', 'inputs': ['u1']},
-     r"[\n]name='mysys', inputs=\['u1'\]", r"states|outputs|dt"),
+     r"[\n]name='mysys', states=4, outputs=3, inputs=\['u1'\]", r"dt"),
     (ct.ss, {'name': 'mysys', 'states': [
         'long_state_1', 'long_state_2', 'long_state_3']},
-     r"[\n]name='.*', states=\[.*\]\)", r"inputs|outputs|dt"),
+     r"[\n]name='.*', states=\[.*\],\noutputs=3, inputs=2\)", r"dt"),
 ])
 @pytest.mark.parametrize("format", ['info', 'eval'])
 def test_iosys_repr(fcn, spec, expected, missing, format):

control/tests/statesp_test.py

@@ -746,7 +746,7 @@ def test_repr(self, sys322):
        [ 1.,  4.,  3.]]),
 array([[-2.,  4.],
        [ 0.,  1.]]),
-name='sys322'{dt})"""
+name='sys322'{dt}, states=3, outputs=2, inputs=2)"""
         assert ct.iosys_repr(sys322, format='eval') == ref322.format(dt='')
         sysd = StateSpace(sys322.A, sys322.B,
                           sys322.C, sys322.D, 0.4)

control/tests/xferfcn_test.py

@@ -1087,19 +1087,22 @@ def test_html_repr(self):
         [(([-1., 4.], [1., 3., 5.]),
           "TransferFunction(\n"
           "array([-1.,  4.]),\n"
-          "array([1., 3., 5.]))"),
+          "array([1., 3., 5.]),\n"
+          "outputs=1, inputs=1)"),
          (([2., 3., 0.], [1., -3., 4., 0], 2.0),
           "TransferFunction(\n"
           "array([2., 3., 0.]),\n"
           "array([ 1., -3.,  4.,  0.]),\n"
-          "dt=2.0)"),
+          "dt=2.0,\n"
+          "outputs=1, inputs=1)"),
          (([[[0, 1], [2, 3]], [[4, 5], [6, 7]]],
            [[[6, 7], [4, 5]], [[2, 3], [0, 1]]]),
           "TransferFunction(\n"
           "[[array([1]), array([2, 3])],\n"
           " [array([4, 5]), array([6, 7])]],\n"
           "[[array([6, 7]), array([4, 5])],\n"
-          " [array([2, 3]), array([1])]])"),
+          " [array([2, 3]), array([1])]],\n"
+          "outputs=2, inputs=2)"),
          (([[[0, 1], [2, 3]], [[4, 5], [6, 7]]],
            [[[6, 7], [4, 5]], [[2, 3], [0, 1]]],
            0.5),
@@ -1108,7 +1111,8 @@ def test_html_repr(self):
           " [array([4, 5]), array([6, 7])]],\n"
           "[[array([6, 7]), array([4, 5])],\n"
           " [array([2, 3]), array([1])]],\n"
-          "dt=0.5)"),
+          "dt=0.5,\n"
+          "outputs=2, inputs=2)"),
          ])
     def test_loadable_repr(self, Hargs, ref):
         """Test __repr__ printout."""

control/xferfcn.py

@@ -509,7 +509,7 @@ def _repr_eval_(self):
                 out += "],\n[" if entry is self.num_array else "]"
 
         out += super()._dt_repr(separator=",\n", space="")
-        if len(labels := self._label_repr(show_count=False)) > 0:
+        if len(labels := self._label_repr()) > 0:
             out += ",\n" + labels
 
         out += ")"