Bugfix: correct TestMatlab tests.

roryyorke · roryyorke · commit b12e13281df5 · 2015-06-25T21:56:10.000+02:00
Revert gain and phase frequency swap in TestMatlab.testCombi01.

Correct TestMatlab.testMargin.
diff --git a/control/tests/matlab_test.py b/control/tests/matlab_test.py
@@ -257,7 +257,7 @@ def testMargin(self):
         gm, pm, wg, wp = margin(self.siso_ss2);
         gm, pm, wg, wp = margin(self.siso_ss2*self.siso_ss2*2);
         np.testing.assert_array_almost_equal(
-            [gm, pm, wg, wp], [1.5451, 75.9933, 0.6559, 1.2720], decimal=3)
+            [gm, pm, wg, wp], [1.5451, 75.9933, 1.2720, 0.6559], decimal=3)
 
     def testDcgain(self):
         #Create different forms of a SISO system
@@ -608,8 +608,8 @@ def testCombi01(self):
         # print("%f %f %f %f" % (gm, pm, wg, wp))
         self.assertAlmostEqual(gm, 3.32065569155)
         self.assertAlmostEqual(pm, 46.9740430224)
-        self.assertAlmostEqual(wg, 0.0616288455466)
-        self.assertAlmostEqual(wp, 0.176469728448)
+        self.assertAlmostEqual(wg, 0.176469728448)
+        self.assertAlmostEqual(wp, 0.0616288455466)
 
 #! TODO: not yet implemented
 #    def testMIMOtfdata(self):
