update FRD repr() + copy signal/system names on sampling

murrayrm · murrayrm · commit 4cedb6cc4088 · 2025-01-12T17:27:13.000-08:00
diff --git a/control/frdata.py b/control/frdata.py
@@ -285,7 +285,6 @@ def __init__(self, *args, **kwargs):
         if self.squeeze not in (None, True, False):
             raise ValueError("unknown squeeze value")
 
-        # Process iosys keywords
         defaults = {
             'inputs': self.fresp.shape[1] if not getattr(
                 self, 'input_index', None) else self.input_labels,
@@ -421,10 +420,20 @@ def __repr__(self):
 
         limited for number of data points.
         """
-        return "FrequencyResponseData({d}, {w}{smooth})".format(
+        out = "FrequencyResponseData(\n{d},\n{w}{smooth}".format(
             d=repr(self.fresp), w=repr(self.omega),
             smooth=(self._ifunc and ", smooth=True") or "")
 
+        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 __neg__(self):
         """Negate a transfer function."""
 
diff --git a/control/tests/frd_test.py b/control/tests/frd_test.py
@@ -465,10 +465,12 @@ def test_repr_str(self):
             [0.1, 1.0, 10.0, 100.0], name='sys0')
         sys1 = ct.frd(
             sys0.fresp, sys0.omega, smooth=True, name='sys1')
-        ref0 = "FrequencyResponseData(" \
-            "array([[[1.  +0.j , 0.9 +0.1j, 0.1 +2.j , 0.05+3.j ]]])," \
-            " array([  0.1,   1. ,  10. , 100. ]))"
-        ref1 = ref0[:-1] + ", smooth=True)"
+        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', 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')
 
