use Hz=False for MATLAB + docstring corrections

murrayrm · murrayrm · commit 249d85e854e7 · 2020-03-21T10:06:46.000-07:00
diff --git a/control/config.py b/control/config.py
@@ -114,11 +114,11 @@ def use_matlab_defaults():
 
     The following conventions are used:
         * Bode plots plot gain in dB, phase in degrees, frequency in
-          Hertz, with grids
+          rad/sec, with grids
         * State space class and functions use Numpy matrix objects
 
     """
-    set_defaults('bode', dB=True, deg=True, Hz=True, grid=True)
+    set_defaults('bode', dB=True, deg=True, Hz=False, grid=True)
     set_defaults('statesp', use_numpy_matrix=True)
 
 
@@ -128,7 +128,7 @@ def use_fbs_defaults():
 
     The following conventions are used:
         * Bode plots plot gain in powers of ten, phase in degrees,
-          frequency in Hertz, no grid
+          frequency in rad/sec, no grid
 
     """
     set_defaults('bode', dB=False, deg=True, Hz=False, grid=False)
diff --git a/control/tests/config_test.py b/control/tests/config_test.py
@@ -107,8 +107,8 @@ def test_matlab_bode(self):
         mag_data = mag_line[0].get_data()
         mag_x, mag_y = mag_data
 
-        # Make sure the x-axis is in Hertz and y-axis is in dB
-        np.testing.assert_almost_equal(mag_x[0], 0.001 / (2*pi), decimal=6)
+        # Make sure the x-axis is in rad/sec and y-axis is in dB
+        np.testing.assert_almost_equal(mag_x[0], 0.001, decimal=6)
         np.testing.assert_almost_equal(mag_y[0], 20*log10(10), decimal=3)
 
         # Get the phase line
@@ -117,8 +117,8 @@ def test_matlab_bode(self):
         phase_data = phase_line[0].get_data()
         phase_x, phase_y = phase_data
 
-        # Make sure the x-axis is in Hertz and y-axis is in degrees
-        np.testing.assert_almost_equal(phase_x[-1], 1000 / (2*pi), decimal=1)
+        # Make sure the x-axis is in rad/sec and y-axis is in degrees
+        np.testing.assert_almost_equal(phase_x[-1], 1000, decimal=1)
         np.testing.assert_almost_equal(phase_y[-1], -180, decimal=0)
         
         # Override the defaults and make sure that works as well
