found two remaining unit test bugs! (switch from * to np.dot)

sawyerbfuller · sawyerbfuller · commit 5ecc543c2fe0 · 2020-07-23T02:10:10.000-07:00
diff --git a/control/tests/iosys_test.py b/control/tests/iosys_test.py
@@ -151,9 +151,9 @@ def test_nonlinear_iosys(self):
 
         # Create a nonlinear system with the same dynamics
         nlupd = lambda t, x, u, params: \
-            np.reshape(linsys.A * np.reshape(x, (-1, 1)) + linsys.B * u, (-1,))
+            np.reshape(np.dot(linsys.A, np.reshape(x, (-1, 1))) + np.dot(linsys.B, u), (-1,))
         nlout = lambda t, x, u, params: \
-            np.reshape(linsys.C * np.reshape(x, (-1, 1)) + linsys.D * u, (-1,))
+            np.reshape(np.dot(linsys.C, np.reshape(x, (-1, 1))) + np.dot(linsys.D, u), (-1,))
         nlsys = ios.NonlinearIOSystem(nlupd, nlout)
 
         # Make sure that simulations also line up
@@ -747,8 +747,8 @@ def test_named_signals(self):
                 + np.dot(self.mimo_linsys1.B, np.reshape(u, (-1, 1)))
             ).reshape(-1,),
             outfcn = lambda t, x, u, params: np.array(
-                self.mimo_linsys1.C * np.reshape(x, (-1, 1)) \
-                + self.mimo_linsys1.D * np.reshape(u, (-1, 1))
+                np.dot(self.mimo_linsys1.C, np.reshape(x, (-1, 1))) \
+                + np.dot(self.mimo_linsys1.D, np.reshape(u, (-1, 1)))
             ).reshape(-1,),
             inputs = ('u[0]', 'u[1]'),
             outputs = ('y[0]', 'y[1]'),
