update unit tests + tweak formatting for consistency

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()) > 0:
+        if len(labels := self._label_repr(show_count=False)) > 0:
             out += ",\n" + labels
 
         out += ")"

control/iosys.py

@@ -253,7 +253,7 @@ def __str__(self):
         out += f"\nOutputs ({self.noutputs}): {self.output_labels}"
         if self.nstates is not None:
             out += f"\nStates ({self.nstates}): {self.state_labels}"
-        out += self._dt_repr("\n")
+        out += self._dt_repr(separator="\n", space=" ")
         return out
 
     def __repr__(self):
@@ -262,7 +262,7 @@ def __repr__(self):
     def _repr_info_(self, html=False):
         out = f"<{self.__class__.__name__} {self.name}: " + \
             f"{list(self.input_labels)} -> {list(self.output_labels)}"
-        out += self._dt_repr(", ") + ">"
+        out += self._dt_repr(separator=", ", space="") + ">"
 
         if html:
             # Replace symbols that might be interpreted by HTML processing
@@ -353,10 +353,11 @@ def _label_repr(self, show_count=True):
 
         return out
 
-    def _dt_repr(self, separator="\n"):
+    def _dt_repr(self, separator="\n", space=""):
         if config.defaults['control.default_dt'] != self.dt:
-            return "{separator}dt={dt}".format(
-                separator=separator, dt='None' if self.dt is None else self.dt)
+            return "{separator}dt{space}={space}{dt}".format(
+                separator=separator, space=space,
+                dt='None' if self.dt is None else self.dt)
         else:
             return ""
 

control/statesp.py

@@ -393,7 +393,7 @@ def _repr_eval_(self):
             A=self.A.__repr__(), B=self.B.__repr__(),
             C=self.C.__repr__(), D=self.D.__repr__())
 
-        out += super()._dt_repr(",\n")
+        out += super()._dt_repr(separator=",\n", space="")
         if len(labels := super()._label_repr(show_count=False)) > 0:
             out += ",\n" + labels
 
@@ -421,9 +421,11 @@ def _repr_html_(self):
         if syssize > config.defaults['statesp.latex_maxsize']:
             return None
         elif config.defaults['statesp.latex_repr_type'] == 'partitioned':
-            return super()._repr_info_(html=True) + self._latex_partitioned()
+            return super()._repr_info_(html=True) + \
+                "\n" + self._latex_partitioned()
         elif config.defaults['statesp.latex_repr_type'] == 'separate':
-            return super()._repr_info_(html=True) + self._latex_separate()
+            return super()._repr_info_(html=True) + \
+                "\n" + self._latex_separate()
         else:
             raise ValueError(
                 "Unknown statesp.latex_repr_type '{cfg}'".format(

control/tests/docstrings_test.py

@@ -35,7 +35,7 @@
     control.lqe:                        '567bf657538935173f2e50700ba87168',
     control.lqr:                        'a3e0a85f781fc9c0f69a4b7da4f0bd22',
     control.margin:                     'f02b3034f5f1d44ce26f916cc3e51600',
-    control.parallel:                   '025c5195a34c57392223374b6244a8c4',
+    control.parallel:                   'bfc470aef75dbb923f9c6fb8bf3c9b43',
     control.series:                     '9aede1459667738f05cf4fc46603a4f6',
     control.ss2tf:                      '48ff25d22d28e7b396e686dd5eb58831',
     control.tf2ss:                      '086a3692659b7321c2af126f79f4bc11',

control/tests/frd_test.py

@@ -468,9 +468,8 @@ 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', outputs=1, inputs=1)"
-        ref1 = ref_common + " smooth=True," + \
-            "\nname='sys1', outputs=1, inputs=1)"
+        ref0 = ref_common + "\nname='sys0')"
+        ref1 = ref_common + " smooth=True," + "\nname='sys1')"
         sysm = ct.frd(
             np.matmul(array([[1], [2]]), sys0.fresp), sys0.omega, name='sysm')
 
@@ -505,19 +504,22 @@ def test_repr_str(self):
 Outputs (1): ['y[0]']
 
 Input 1 to output 1:
-Freq [rad/s]  Response
-------------  ---------------------
-       0.100           1        +0j
-       1.000         0.9      +0.1j
-      10.000         0.1        +2j
-     100.000        0.05        +3j
+
+  Freq [rad/s]  Response
+  ------------  ---------------------
+         0.100           1        +0j
+         1.000         0.9      +0.1j
+        10.000         0.1        +2j
+       100.000        0.05        +3j
+
 Input 2 to output 1:
-Freq [rad/s]  Response
-------------  ---------------------
-       0.100           2        +0j
-       1.000         1.8      +0.2j
-      10.000         0.2        +4j
-     100.000         0.1        +6j"""
+
+  Freq [rad/s]  Response
+  ------------  ---------------------
+         0.100           2        +0j
+         1.000         1.8      +0.2j
+        10.000         0.2        +4j
+       100.000         0.1        +6j"""
         assert str(sysm) == refm
 
     def test_unrecognized_keyword(self):

control/tests/iosys_test.py

@@ -2290,32 +2290,32 @@ def test_signal_indexing():
 
 @slycotonly
 @pytest.mark.parametrize("fcn, spec, expected, missing", [
-    (ct.ss, {}, "\nstates=4, outputs=3, inputs=2", r"dt|name"),
-    (ct.tf, {}, "\noutputs=3, inputs=2", r"dt|name|states"),
-    (ct.frd, {}, "\noutputs=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"name|states"),
+    (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,\noutputs=3, inputs=2", r"name|states"),
-    (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}, "\nstates=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"),
+     ".*\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, {'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]states=4, outputs=3, inputs=\['u1'\]", r"dt|name"),
+     r"[\n]inputs=\['u1'\]", r"states|outputs|dt|name"),
     (ct.tf, {'inputs': ['u1']},
-     r"[\n]outputs=3, inputs=\['u1'\]", r"dt|name"),
+     r"[\n]inputs=\['u1'\]", r"outputs|dt|name"),
     (ct.frd, {'inputs': ['u1'], 'name': 'sampled'},
-     r"[\n]name='sampled', outputs=3, inputs=\['u1'\]", r"dt"),
+     r"[\n]name='sampled', inputs=\['u1'\]", r"outputs|dt"),
     (ct.ss, {'outputs': ['y1']},
-     r"[\n]states=4, outputs=\['y1'\], inputs=2", r"dt|name"),
+     r"[\n]outputs=\['y1'\]", r"states|inputs|dt|name"),
     (ct.ss, {'name': 'mysys', 'inputs': ['u1']},
-     r"[\n]name='mysys', states=4, outputs=3, inputs=\['u1'\]", r"dt"),
+     r"[\n]name='mysys', inputs=\['u1'\]", r"states|outputs|dt"),
     (ct.ss, {'name': 'mysys', 'states': [
         'long_state_1', 'long_state_2', 'long_state_3']},
-     r"[\n]name='.*', states=\[.*\],[\n]outputs=3, inputs=2\)", r"dt"),
+     r"[\n]name='.*', states=\[.*\]\)", r"inputs|outputs|dt"),
 ])
 @pytest.mark.parametrize("format", ['info', 'eval'])
 def test_iosys_repr(fcn, spec, expected, missing, format):
@@ -2335,7 +2335,11 @@ def test_iosys_repr(fcn, spec, expected, missing, format):
 
     # Construct the 'info' format
     info_expected = f"<{sys.__class__.__name__} {sys.name}: " \
-        f"{sys.input_labels} -> {sys.output_labels}>"
+        f"{sys.input_labels} -> {sys.output_labels}"
+    if sys.dt != 0:
+        info_expected += f", dt={sys.dt}>"
+    else:
+        info_expected += ">"
 
     # Make sure the default format is OK
     out = repr(sys)

control/tests/lti_test.py

@@ -408,5 +408,5 @@ def test_printoptions(
         if str_expected is not None:
             assert re.search(str_expected, str(sys)) is not None
 
-        # Test LaTeX representation
-        assert re.search(latex_expected, sys._repr_latex_()) is not None
+        # Test LaTeX/HTML representation
+        assert re.search(latex_expected, sys._repr_html_()) is not None