disabled MIMO test when no slycot

repagh · repagh · commit 92a33541da4f · 2018-06-20T23:45:44.000+02:00
diff --git a/control/statesp.py b/control/statesp.py
@@ -775,6 +775,7 @@ def _convertToStateSpace(sys, **kw):
 
             # Change the numerator and denominator arrays so that the transfer
             # function matrix has a common denominator.
+            # matrices are also sized/padded to fit td04ad
             num, den, denorder = sys._common_den()
 
             # transfer function to state space conversion now should work!
diff --git a/control/tests/convert_test.py b/control/tests/convert_test.py
@@ -232,14 +232,18 @@ def testSs2tfStaticMimo(self):
     def testTf2SsDuplicatePoles(self):
         """Tests for "too few poles for MIMO tf #111" """
         import control
-        num = [ [ [1], [0] ],
-                [ [0], [1] ] ]
+        try:
+            import slycot
+            num = [ [ [1], [0] ],
+                   [ [0], [1] ] ]
 
-        den = [ [ [1,0], [1] ],
+            den = [ [ [1,0], [1] ],
                 [ [1],   [1,0] ] ]
-        g = control.tf(num, den)
-        s = control.ss(g)
-        np.testing.assert_array_equal(g.pole(), s.pole())
+            g = control.tf(num, den)
+            s = control.ss(g)
+            np.testing.assert_array_equal(g.pole(), s.pole())
+        except ImportError:
+            print("Slycot not present, skipping")
 
 def suite():
    return unittest.TestLoader().loadTestsFromTestCase(TestConvert)
