add ndarray.ndim==0 to test_squeeze

bnavigator · bnavigator · commit 4b44923a592f · 2021-03-28T22:00:42.000+02:00
diff --git a/control/tests/lti_test.py b/control/tests/lti_test.py
@@ -160,28 +160,46 @@ def test_isdtime(self, objfun, arg, dt, ref, strictref):
     @pytest.mark.parametrize("fcn", [ct.ss, ct.tf, ct.frd, ct.ss2io])
     @pytest.mark.parametrize("nstate, nout, ninp, omega, squeeze, shape", [
         [1, 1, 1, 0.1,          None,  ()],             # SISO
+        [1, 1, 1, np.array(0.1), None,  ()],
         [1, 1, 1, [0.1],        None,  (1,)],
         [1, 1, 1, [0.1, 1, 10], None,  (3,)],
         [2, 1, 1, 0.1,          True,  ()],
+        [2, 1, 1, np.array(0.1), True,  ()],
         [2, 1, 1, [0.1],        True,  ()],
         [2, 1, 1, [0.1, 1, 10], True,  (3,)],
         [3, 1, 1, 0.1,          False, (1, 1)],
+        [3, 1, 1, np.array(0.1), False,  (1, 1)],
         [3, 1, 1, [0.1],        False, (1, 1, 1)],
         [3, 1, 1, [0.1, 1, 10], False, (1, 1, 3)],
         [1, 2, 1, 0.1,          None,  (2, 1)],         # SIMO
+        [1, 2, 1, np.array(0.1), None,  (2, 1)],
         [1, 2, 1, [0.1],        None,  (2, 1, 1)],
         [1, 2, 1, [0.1, 1, 10], None,  (2, 1, 3)],
         [2, 2, 1, 0.1,          True,  (2,)],
+        [2, 2, 1, np.array(0.1), True,  (2,)],
         [2, 2, 1, [0.1],        True,  (2,)],
         [3, 2, 1, 0.1,          False, (2, 1)],
+        [3, 2, 1, np.array(0.1), False, (2, 1)],
         [3, 2, 1, [0.1],        False, (2, 1, 1)],
         [3, 2, 1, [0.1, 1, 10], False, (2, 1, 3)],
         [1, 1, 2, [0.1, 1, 10], None, (1, 2, 3)],       # MISO
         [2, 1, 2, [0.1, 1, 10], True, (2, 3)],
         [3, 1, 2, [0.1, 1, 10], False, (1, 2, 3)],
+        [1, 1, 2, 0.1,          None, (1, 2)],
+        [1, 1, 2, np.array(0.1), None, (1, 2)],
+        [1, 1, 2, 0.1,          True, (2,)],
+        [1, 1, 2, np.array(0.1), True, (2,)],
+        [1, 1, 2, 0.1,          False, (1, 2)],
+        [1, 1, 2, np.array(0.1), False, (1, 2)],
         [1, 2, 2, [0.1, 1, 10], None, (2, 2, 3)],       # MIMO
         [2, 2, 2, [0.1, 1, 10], True, (2, 2, 3)],
-        [3, 2, 2, [0.1, 1, 10], False, (2, 2, 3)]
+        [3, 2, 2, [0.1, 1, 10], False, (2, 2, 3)],
+        [1, 2, 2, 0.1, None, (2, 2)],
+        [1, 2, 2, np.array(0.1), None, (2, 2)],
+        [2, 2, 2, 0.1, True, (2, 2)],
+        [2, 2, 2, np.array(0.1), True, (2, 2)],
+        [3, 2, 2, 0.1, False, (2, 2)],
+        [3, 2, 2, np.array(0.1), False, (2, 2)],
     ])
     def test_squeeze(self, fcn, nstate, nout, ninp, omega, squeeze, shape):
         # Create the system to be tested
@@ -194,8 +212,8 @@ def test_squeeze(self, fcn, nstate, nout, ninp, omega, squeeze, shape):
             sys = fcn(ct.rss(nstate, nout, ninp))
 
         # Convert the frequency list to an array for easy of use
-        isscalar = not hasattr(omega, '__len__')
-        omega = np.array(omega)
+        omega = np.asarray(omega)
+        isscalar = omega.ndim == 0
 
         # Call the transfer function directly and make sure shape is correct
         assert sys(omega * 1j, squeeze=squeeze).shape == shape
