fixes to pass tests

sawyerbfuller · sawyerbfuller · commit 060b2f0793e9 · 2021-01-28T13:55:06.000-08:00
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -351,7 +351,8 @@ def bode_plot(syslist, omega=None,
                 # Show the phase and gain margins in the plot
                 if margins:
                     # Compute stability margins for the system
-                    gm, pm, Wcg, Wcp = stability_margins(sys)[0:4]
+                    margin = stability_margins(sys)
+                    gm, pm, Wcg, Wcp = (margin[i] for i in (0, 1, 3, 4))
 
                     # Figure out sign of the phase at the first gain crossing
                     # (needed if phase_wrap is True)
diff --git a/control/tests/config_test.py b/control/tests/config_test.py
@@ -203,7 +203,7 @@ def test_reset_defaults(self):
         assert not ct.config.defaults['bode.dB']
         assert ct.config.defaults['bode.deg']
         assert not ct.config.defaults['bode.Hz']
-        assert ct.config.defaults['freqplot.number_of_samples'] is None
+        assert ct.config.defaults['freqplot.number_of_samples'] is 1000
         assert ct.config.defaults['freqplot.feature_periphery_decades'] == 1.0
 
     def test_legacy_defaults(self):
diff --git a/control/tests/sisotool_test.py b/control/tests/sisotool_test.py
@@ -78,8 +78,8 @@ def test_sisotool(self, sys):
 
         # Check if the bode_mag line has moved
         bode_mag_moved = np.array(
-            [111.83321224, 92.29238035, 76.02822315, 62.46884113, 51.14108703,
-             41.6554004, 33.69409534, 27.00237344, 21.38086717, 16.67791585])
+            [674.0242, 667.8354, 661.7033, 655.6275, 649.6074, 643.6426,
+              637.7324, 631.8765, 626.0742, 620.3252])
         assert_array_almost_equal(ax_mag.lines[0].get_data()[1][10:20],
                                   bode_mag_moved, 4)
 
