small change to unittests

icam0 · icam0 · commit 6e06a9cafee4 · 2018-06-03T16:23:21.000+02:00
diff --git a/control/rlocus.py b/control/rlocus.py
@@ -102,7 +102,7 @@ def root_locus(sys, kvect=None, xlim=None, ylim=None, plotstr='b' if int(matplot
         start_mat = _RLFindRoots(nump, denp, [1])
         kvect, mymat, xlim, ylim = _default_gains(nump, denp, xlim, ylim)
     else:
-        start_mat = _RLFindRoots(nump, denp, kvect[0])
+        start_mat = _RLFindRoots(nump, denp, [kvect[0]])
         mymat = _RLFindRoots(nump, denp, kvect)
         mymat = _RLSortRoots(mymat)
 
diff --git a/control/tests/rlocus_test.py b/control/tests/rlocus_test.py
@@ -45,7 +45,7 @@ def test_without_gains(self):
             roots, kvect = root_locus(sys, Plot=False)
             self.check_cl_poles(sys, roots, kvect)
 
-    def testRootLocusZoom(self):
+    def test_root_locus_zoom(self):
         """Check the zooming functionality of the Root locus plot"""
         system = TransferFunction([1000], [1, 25, 100, 0])
         root_locus(system)
diff --git a/control/tests/sisotool_test.py b/control/tests/sisotool_test.py
@@ -26,10 +26,6 @@ def test_sisotool(self):
         assert_array_almost_equal(ax_rlocus.lines[1].get_data(),initial_point_1)
         assert_array_almost_equal(ax_rlocus.lines[2].get_data(),initial_point_2)
 
-        # Check the bode plot magnitude line
-        bode_mag_original = np.array([ 15.12670407,  12.48358602,  10.28367521,   8.44961576,   6.91740918, 5.63436301,   4.55750665,   3.65237575,   2.89200358,   2.25587634])
-        assert_array_almost_equal(ax_mag.lines[0].get_data()[1][10:20],bode_mag_original)
-
         # Check the step response before moving the point
         step_response_original = np.array([ 0.,          0.02233651,  0.13118374,  0.33078542,  0.5907113,   0.87041549, 1.13038536,  1.33851053,  1.47374666,  1.52757114])
         assert_array_almost_equal(ax_step.lines[0].get_data()[1][:10],step_response_original)
