Add test and fix for mismatched row outputs

sdahdah · sdahdah · commit 758fa9df5fc9 · 2024-12-04T11:11:48.000-05:00
diff --git a/control/bdalg.py b/control/bdalg.py
@@ -580,11 +580,15 @@ def combine(tf_array):
     # Iterate over
     num = []
     den = []
-    for row in ensured_tf_array:
+    for row_index, row in enumerate(ensured_tf_array):
         for j_out in range(row[0].noutputs):
             num_row = []
             den_row = []
             for col in row:
+                if col.noutputs != row[0].noutputs:
+                    raise ValueError(
+                        f"Mismatched number of transfer function outputs in row {row_index}."
+                    )
                 for j_in in range(col.ninputs):
                     num_row.append(col.num[j_out][j_in])
                     den_row.append(col.den[j_out][j_in])
diff --git a/control/tests/bdalg_test.py b/control/tests/bdalg_test.py
@@ -756,6 +756,65 @@ def test_split(self, tf_array, tf):
                 ],
                 ValueError,
             ),
+            # Incompatible dimensions
+            (
+                [
+                    [
+                        ctrl.TransferFunction(
+                            [
+                                [
+                                    [1],
+                                ]
+                            ],
+                            [
+                                [
+                                    [1, 1],
+                                ]
+                            ],
+                        ),
+                        ctrl.TransferFunction(
+                            [
+                                [[2], [1]],
+                                [[1], [3]],
+                            ],
+                            [
+                                [[1, 0], [1, 0]],
+                                [[1, 0], [1, 0]],
+                            ],
+                        ),
+                    ],
+                ],
+                ValueError,
+            ),
+            (
+                [
+                    [
+                        ctrl.TransferFunction(
+                            [
+                                [[2], [1]],
+                                [[1], [3]],
+                            ],
+                            [
+                                [[1, 0], [1, 0]],
+                                [[1, 0], [1, 0]],
+                            ],
+                        ),
+                        ctrl.TransferFunction(
+                            [
+                                [
+                                    [1],
+                                ]
+                            ],
+                            [
+                                [
+                                    [1, 1],
+                                ]
+                            ],
+                        ),
+                    ],
+                ],
+                ValueError,
+            ),
         ],
     )
     def test_error_combine(self, tf_array, exception):
@@ -769,9 +828,9 @@ def _tf_close_coeff(tf_a, tf_b, rtol=1e-5, atol=1e-8):
 
     Parameters
     ----------
-    tf_a : control.TransferFunction
+    tf_a : TransferFunction
         First transfer function.
-    tf_b : control.TransferFunction
+    tf_b : TransferFunction
         Second transfer function.
     rtol : float
         Relative tolerance for :func:`np.allclose`.
