10000 Merge pull request #809 from sawyerbfuller/kvect · python-control/python-control@b1d55a1 · GitHub
[go: up one dir, main page]
Skip to content

Commit b1d55a1

Browse files
murrayrmmurrayrm
authored
Merge pull request #809 from sawyerbfuller/kvect
fix gain handling in rlocus and sisotool
2 parents 4b712a4 + 15543ff commit b1d55a1

File tree

6 files changed

+140
-96
lines changed

6 files changed

+140
-96
lines changed

‎control/config.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ def reset_defaults():
9797
from .rlocus import _rlocus_defaults
9898
defaults.update(_rlocus_defaults)
9999

100+
from .sisotool import _sisotool_defaults
101+
defaults.update(_sisotool_defaults)
102+
100103
from .namedio import _namedio_defaults
101104
defaults.update(_namedio_defaults)
102105

‎control/matlab/wrappers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def nyquist(*args, **kwargs):
117117
def _parse_freqplot_args(*args):
118118
"""Parse arguments to frequency plot routines (bode, nyquist)"""
119119
syslist, plotstyle, omega, other = [], [], None, {}
120-
i = 0;
120+
i = 0
121121
while i < len(args):
122122
# Check to see if this is a system of some sort
123123
if issys(args[i]):

0 commit comments

Comments
 (0)
0