Merge branch 'master' of github.com:jgoppert/python-control into dev

jgoppert · jgoppert · commit fd19250b6bc7 · 2014-08-11T20:14:29.000-04:00
Conflicts:
	control/freqplot.py
	control/tests/test_control_matlab.py
	control/tests/xferfcn_test.py
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -245,7 +245,8 @@ def nyquist_plot(syslist, omega=None, Plot=True, color='b',
 
             # Label the frequencies of the points
             if (labelFreq):
-                for xpt, ypt, omegapt in list(zip(x, y, omega))[::labelFreq]:
+                ind = slice(None, None, labelFreq)
+                for xpt, ypt, omegapt in zip(x[ind], y[ind], omega[ind]):
                     # Convert to Hz
                     f = omegapt/(2*sp.pi)
 
diff --git a/control/tests/matlab_test.py b/control/tests/matlab_test.py
@@ -319,7 +319,7 @@ def testFreqresp(self):
 
     def testEvalfr(self):
         w = 1j
-        self.assertEqual(evalfr(self.siso_ss1, w), 44.8-21.4j)
+        np.testing..assert_almost_equal(evalfr(self.siso_ss1, w), 44.8-21.4j)
         evalfr(self.siso_ss2, w)
         evalfr(self.siso_ss3, w)
         evalfr(self.siso_tf1, w)
diff --git a/control/tests/test_control_matlab.py b/control/tests/test_control_matlab.py
@@ -476,5 +476,4 @@ def debug_nasty_import_problem():
     unittest.main()
     show()
     print("Test finished correctly!")
-
 # vi:ts=4:sw=4:expandtab
diff --git a/control/tests/xferfcn_test.py b/control/tests/xferfcn_test.py
@@ -7,7 +7,8 @@
 import numpy as np
 from control.statesp import StateSpace, _convertToStateSpace
 from control.xferfcn import TransferFunction, _convertToTransferFunction
-from control.lti import isdtime
+# from control.lti import isdtime
+
 
 class TestXferFcn(unittest.TestCase):
     """These are tests for functionality and correct reporting of the transfer
@@ -94,12 +95,11 @@ def testTruncateCoeff2(self):
 
     # Tests for TransferFunction.__neg__
 
-
     @unittest.skip("skipping, known issue with Python 3")
     def testNegScalar(self):
         """Negate a direct feedthrough system."""
 
-        sys1 = TransferFunction(2., np.array([-3]))
+        sys1 = TransferFunction(2., np.array([-3.]))
         sys2 = - sys1
 
         np.testing.assert_array_equal(sys2.num, [[[-2.]]])
