Skip to content

Conversation

@roryyorke
Copy link
Contributor

This is a straightforward fix to margin.

The related tests have some odd properties, e.g., TestMargin in margin_test.py has four test systems, but only checks the results for one of them; and similarly TestMatlab.testMargin() runs margin() on five systems, but only checks one result.

Oh, and apologies for the two commits; I didn't run the full test suite before the first commit.

control.margins.margin() was returning the gain and phase margin
frequencies in the wrong order.

Added TestMargin.test_margin, duplicating test case from
TestMargin.test_stability_margins, in margin_test.py, and unskipped
TestMatlab.testCombi01 in matlab_test.py.
Revert gain and phase frequency swap in TestMatlab.testCombi01.

Correct TestMatlab.testMargin.
repagh added a commit that referenced this pull request Jul 11, 2015
Margin fix

You are right on this one.
@repagh repagh merged commit b03e294 into python-control:master Jul 11, 2015
@roryyorke roryyorke deleted the margin-fix branch July 12, 2015 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants