fix bug concatenating zero dimensional when test in matlab_test.py

gonmolina · gonmolina · commit 71304344ffe7 · 2017-03-20T23:55:21.000-03:00
diff --git a/control/rlocus.py b/control/rlocus.py
@@ -222,13 +222,11 @@ def _k_max(num, den, real_break_points, k_break_points):
         asymp_angles = (2 * np.arange(0, asymp_number)-1) * np.pi / asymp_number
         farthest_points = asymp_center + distance_max * np.exp(asymp_angles * 1j)  # farthest points over asymptotes
         kmax_asymp = -den(farthest_points) / num(farthest_points)
-        if kmax_asymp == 0:
-            kmax_asymp = [den.coeffs[0]/num.coeffs[0]*3]
     else:
         farthest_points = 2 * np.max(np.abs(important_points))
-        kmax_asymp = -den(farthest_points) / num(farthest_points)
-        if kmax_asymp == 0:
-            kmax_asymp = -den(1) / num(1)
+        kmax_asymp = [-den(farthest_points) / num(farthest_points)]
+    if kmax_asymp == 0:
+        kmax_asymp = [den.coeffs[0] / num.coeffs[0] * 3]
     kmax = np.max(np.concatenate((np.real(kmax_asymp), k_break_points), axis=0))
     return kmax
 
