fixed a few bugs that slipped through

sawyerbfuller · sawyerbfuller · commit 6213a543debb · 2020-08-16T01:11:03.000-07:00
diff --git a/control/matlab/__init__.py b/control/matlab/__init__.py
@@ -224,8 +224,8 @@
 \*  :func:`~control.nichols`    Nichols plot
 \*  :func:`margin`              gain and phase margins
 \   lti/allmargin               all crossover frequencies and margins
-\*  :func:`freqresp`            frequency response over a frequency grid
-\*  :func:`evalfr`              frequency response at single frequency
+\*  :func:`freqresp`            frequency response 
+\*  :func:`evalfr`              frequency response at complex frequency s
 ==  ==========================  ============================================
 
 
diff --git a/control/statesp.py b/control/statesp.py
@@ -527,6 +527,7 @@ def horner(self, s):
         # Preallocate 
         out = empty((self.outputs, self.inputs, len(s_arr)), dtype=complex)
         
+        #TODO: can this be vectorized? 
         for idx, s_idx in enumerate(s_arr):
             out[:,:,idx] = \
                 np.dot(self.C, 
diff --git a/control/tests/iosys_test.py b/control/tests/iosys_test.py
@@ -860,8 +860,8 @@ def test_lineariosys_statespace(self):
         np.testing.assert_array_equal(
             iosys_siso.pole(), self.siso_linsys.pole())
         omega = np.logspace(.1, 10, 100)
-        mag_io, phase_io, omega_io = iosys_siso.freqresp(omega)
-        mag_ss, phase_ss, omega_ss = self.siso_linsys.freqresp(omega)
+        mag_io, phase_io, omega_io = iosys_siso.frequency_response(omega)
+        mag_ss, phase_ss, omega_ss = self.siso_linsys.frequency_response(omega)
         np.testing.assert_array_equal(mag_io, mag_ss)
         np.testing.assert_array_equal(phase_io, phase_ss)
         np.testing.assert_array_equal(omega_io, omega_ss)
