TST: added simple unit tests for series, parallel

murrayrm · murrayrm · commit 44dd3e634cb8 · 2018-01-02T21:55:18.000-08:00
diff --git a/control/tests/bdalg_test.py b/control/tests/bdalg_test.py
@@ -5,9 +5,12 @@
 
 import unittest
 import numpy as np
+from numpy import sort
+import control as ctrl
 from control.xferfcn import TransferFunction
 from control.statesp import StateSpace
 from control.bdalg import feedback
+from control.lti import zero, pole
 
 class TestFeedback(unittest.TestCase):
     """These are tests for the feedback function in bdalg.py.  Currently, some
@@ -177,6 +180,63 @@ def testTFTF(self):
         np.testing.assert_array_almost_equal(ans2.num, [[[1., 4., 7., 6.]]])
         np.testing.assert_array_almost_equal(ans2.den, [[[1., 4., 9., 8., 5.]]])
 
+    def testLists(self):
+        """Make sure that lists of various lengths work for operations"""
+        sys1 = ctrl.tf([1, 1], [1, 2])
+        sys2 = ctrl.tf([1, 3], [1, 4])
+        sys3 = ctrl.tf([1, 5], [1, 6])
+        sys4 = ctrl.tf([1, 7], [1, 8])
+        sys5 = ctrl.tf([1, 9], [1, 0])
+
+        # Series
+        sys1_2 = ctrl.series(sys1, sys2)
+        np.testing.assert_array_almost_equal(sort(pole(sys1_2)), [-4., -2.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_2)), [-3., -1.])
+        
+        sys1_3 = ctrl.series(sys1, sys2, sys3);
+        np.testing.assert_array_almost_equal(sort(pole(sys1_3)),
+                                             [-6., -4., -2.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_3)), 
+                                             [-5., -3., -1.])
+        
+        sys1_4 = ctrl.series(sys1, sys2, sys3, sys4);
+        np.testing.assert_array_almost_equal(sort(pole(sys1_4)),
+                                             [-8., -6., -4., -2.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_4)),
+                                             [-7., -5., -3., -1.])
+        
+        sys1_5 = ctrl.series(sys1, sys2, sys3, sys4, sys5);
+        np.testing.assert_array_almost_equal(sort(pole(sys1_5)),
+                                             [-8., -6., -4., -2., -0.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_5)), 
+                                             [-9., -7., -5., -3., -1.])
+
+        # Parallel 
+        sys1_2 = ctrl.parallel(sys1, sys2)
+        np.testing.assert_array_almost_equal(sort(pole(sys1_2)), [-4., -2.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_2)),
+                                             sort(zero(sys1 + sys2)))
+        
+        sys1_3 = ctrl.parallel(sys1, sys2, sys3);
+        np.testing.assert_array_almost_equal(sort(pole(sys1_3)),
+                                             [-6., -4., -2.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_3)), 
+                                             sort(zero(sys1 + sys2 + sys3)))
+        
+        sys1_4 = ctrl.parallel(sys1, sys2, sys3, sys4);
+        np.testing.assert_array_almost_equal(sort(pole(sys1_4)),
+                                             [-8., -6., -4., -2.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_4)), 
+                                             sort(zero(sys1 + sys2 + 
+                                                       sys3 + sys4)))
+
+        
+        sys1_5 = ctrl.parallel(sys1, sys2, sys3, sys4, sys5);
+        np.testing.assert_array_almost_equal(sort(pole(sys1_5)),
+                                             [-8., -6., -4., -2., -0.])
+        np.testing.assert_array_almost_equal(sort(zero(sys1_5)), 
+                                             sort(zero(sys1 + sys2 + 
+                                                       sys3 + sys4 + sys5)))
 def suite():
     return unittest.TestLoader().loadTestsFromTestCase(TestFeedback)
 
