remove MATLAB-style matrix constructor from string

murrayrm · murrayrm · commit af4fa21a8833 · 2023-06-10T09:42:08.000-07:00
diff --git a/control/matlab/wrappers.py b/control/matlab/wrappers.py
@@ -48,7 +48,7 @@ def bode(*args, **kwargs):
     --------
     >>> from control.matlab import ss, bode
 
-    >>> sys = ss("1. -2; 3. -4", "5.; 7", "6. 8", "9.")
+    >>> sys = ss([[1, -2], [3, -4]], [[5], [7]], [[6, 8]], 9)
     >>> mag, phase, omega = bode(sys)
 
     .. todo::
diff --git a/control/statesp.py b/control/statesp.py
@@ -105,11 +105,8 @@ def _ssmatrix(data, axis=1):
 
     """
     # Convert the data into an array or matrix, as configured
-    # If data is passed as a string, use (deprecated?) matrix constructor
     if config.defaults['statesp.use_numpy_matrix']:
         arr = np.matrix(data, dtype=float)
-    elif isinstance(data, str):
-        arr = np.array(np.matrix(data, dtype=float))
     else:
         arr = np.array(data, dtype=float)
     ndim = arr.ndim
diff --git a/control/tests/statesp_test.py b/control/tests/statesp_test.py
@@ -196,17 +196,6 @@ def test_copy_constructor_nodt(self, sys322):
         sys = StateSpace(sysin)
         assert sys.dt is None
 
-    def test_matlab_style_constructor(self):
-        """Use (deprecated) matrix-style construction string"""
-        with pytest.deprecated_call():
-            sys = StateSpace("-1 1; 0 2", "0; 1", "1, 0", "0")
-        assert sys.A.shape == (2, 2)
-        assert sys.B.shape == (2, 1)
-        assert sys.C.shape == (1, 2)
-        assert sys.D.shape == (1, 1)
-        for X in [sys.A, sys.B, sys.C, sys.D]:
-            assert ismatarrayout(X)
-
     def test_D_broadcast(self, sys623):
         """Test broadcast of D=0 to the right shape"""
         # Giving D as a scalar 0 should broadcast to the right shape
diff --git a/control/xferfcn.py b/control/xferfcn.py
@@ -1640,8 +1640,8 @@ def tf(*args, **kwargs):
     >>> G  = (s + 1)/(s**2 + 2*s + 1)
 
     >>> # Convert a StateSpace to a TransferFunction object.
-    >>> sys_ss = ct.ss("1. -2; 3. -4", "5.; 7", "6. 8", "9.")
-    >>> sys2 = ct.tf(sys1)
+    >>> sys_ss = ct.ss([[1, -2], [3, -4]], [[5], [7]], [[6, 8]], 9)
+    >>> sys_tf = ct.tf(sys_ss)
 
     """
 
@@ -1801,7 +1801,7 @@ def ss2tf(*args, **kwargs):
     >>> sys1 = ct.ss2tf(A, B, C, D)
 
     >>> sys_ss = ct.ss(A, B, C, D)
-    >>> sys2 = ct.ss2tf(sys_ss)
+    >>> sys_tf = ct.ss2tf(sys_ss)
 
     """
 
