update transfer function repr() + signal/system names

murrayrm · murrayrm · commit 6f7cbfa3a323 · 2025-01-12T17:27:13.000-08:00
diff --git a/control/tests/xferfcn_test.py b/control/tests/xferfcn_test.py
@@ -1086,24 +1086,34 @@ def test_latex_repr(self):
     @pytest.mark.parametrize(
         "Hargs, ref",
         [(([-1., 4.], [1., 3., 5.]),
-          "TransferFunction(array([-1.,  4.]), array([1., 3., 5.]))"),
+          "TransferFunction(\n"
+          "array([-1.,  4.]),\n"
+          "array([1., 3., 5.]),\n"
+          "outputs=1, inputs=1)"),
          (([2., 3., 0.], [1., -3., 4., 0], 2.0),
-          "TransferFunction(array([2., 3., 0.]),"
-          " array([ 1., -3.,  4.,  0.]), 2.0)"),
-
+          "TransferFunction(\n"
+          "array([2., 3., 0.]),\n"
+          "array([ 1., -3.,  4.,  0.]),\n"
+          "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([[array([1]), array([2, 3])],"
-          " [array([4, 5]), array([6, 7])]],"
-          " [[array([6, 7]), array([4, 5])],"
-          " [array([2, 3]), array([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])]],\n"
+          "outputs=2, inputs=2)"),
          (([[[0, 1], [2, 3]], [[4, 5], [6, 7]]],
            [[[6, 7], [4, 5]], [[2, 3], [0, 1]]],
            0.5),
-          "TransferFunction([[array([1]), array([2, 3])],"
-          " [array([4, 5]), array([6, 7])]],"
-          " [[array([6, 7]), array([4, 5])],"
-          " [array([2, 3]), array([1])]], 0.5)")
+          "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])]],\n"
+          "dt=0.5,\n"
+          "outputs=2, inputs=2)"),
          ])
     def test_repr(self, Hargs, ref):
         """Test __repr__ printout."""
diff --git a/control/xferfcn.py b/control/xferfcn.py
@@ -194,6 +194,7 @@ def __init__(self, *args, **kwargs):
                                 % type(args[0]))
             num = args[0].num
             den = args[0].den
+            # TODO: copy over signal names
 
         else:
             raise TypeError("Needs 1, 2 or 3 arguments; received %i."
@@ -491,28 +492,34 @@ def __str__(self, var=None):
     def __repr__(self):
         """Print transfer function in loadable form."""
         if self.issiso():
-            return "TransferFunction({num}, {den}{dt})".format(
-                num=self.num_array[0, 0].__repr__(),
-                den=self.den_array[0, 0].__repr__(),
-                dt=', {}'.format(self.dt) if isdtime(self, strict=True)
-                else '')
+            out = "TransferFunction(\n{num},\n{den}".format(
+                num=self.num[0][0].__repr__(), den=self.den[0][0].__repr__())
         else:
-            out = "TransferFunction(["
+            out = "TransferFunction(\n["
             for entry in [self.num_array, self.den_array]:
                 for i in range(self.noutputs):
-                    out += "[" if i == 0 else " ["
+                    out += "[" if i == 0 else "\n ["
+                    linelen = 0
                     for j in range(self.ninputs):
                         out += ", " if j != 0 else ""
                         numstr = np.array_repr(entry[i, j])
+                        if linelen + len(numstr) > 72:
+                            out += "\n  "
+                            linelen = 0
                         out += numstr
+                        linelen += len(numstr)
                     out += "]," if i < self.noutputs - 1 else "]"
-                out += "], [" if entry is self.num_array else "]"
+                out += "],\n[" if entry is self.num_array else "]"
 
-            if config.defaults['control.default_dt'] != self.dt:
-                out += ", {dt}".format(
-                    dt='None' if self.dt is None else self.dt)
-            out += ")"
-            return out
+        if config.defaults['control.default_dt'] != self.dt:
+            out += ",\ndt={dt}".format(
+                dt='None' if self.dt is None else self.dt)
+
+        if len(labels := self._label_repr()) > 0:
+            out += ",\n" + labels
+
+        out += ")"
+        return out
 
     def _repr_latex_(self, var=None):
         """LaTeX representation of transfer function, for Jupyter notebook."""
@@ -777,7 +784,7 @@ def __getitem__(self, key):
             indices[0], self.output_labels, slice_to_list=True)
         inpdx, inputs = _process_subsys_index(
             indices[1], self.input_labels, slice_to_list=True)
-        
+
         # Construct the transfer function for the subsyste
         num = _create_poly_array((len(outputs), len(inputs)))
         den = _create_poly_array(num.shape)
