8000 Change matlab module to sub-package · XiangPiCha/python-control@12e8147 · GitHub
[go: up one dir, main page]
Skip to content

Commit 12e8147

Browse files
cwrowleycwrowley
committed
Change matlab module to sub-package
1 parent 58c7f85 commit 12e8147

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

‎control/matlab.py renamed to ‎control/matlab/__init__.py

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -73,28 +73,28 @@
7373
# config.use_matlab()
7474

7575
# Control system library
76-
from . import ctrlutil
77-
from . import freqplot
78-
from . import timeresp
79-
from . import margins
80-
from .statesp import StateSpace, _rss_generate, _convertToStateSpace
81-
from .xferfcn import TransferFunction, _convertToTransferFunction
82-
from .lti import LTI # base class of StateSpace, TransferFunction
83-
from .lti import issiso
84-
from .frdata import FRD
85-
from .dtime import sample_system
86-
from .exception import ControlArgument
76+
from .. import ctrlutil
77+
from .. import freqplot
78+
from .. import timeresp
79+
from .. import margins
80+
from ..statesp import StateSpace, _rss_generate, _convertToStateSpace
81+
from ..xferfcn import TransferFunction, _convertToTransferFunction
82+
from ..lti import LTI # base class of StateSpace, TransferFunction
83+
from ..lti import issiso
84+
from ..frdata import FRD
85+
from ..dtime import sample_system
86+
from ..exception import ControlArgument
8787

8888
# Import MATLAB-like functions that can be used as-is
89-
from .ctrlutil import unwrap
90-
from .freqplot import nyquist, gangof4
91-
from .nichols import nichols
92-
from .bdalg import series, parallel, negate, feedback, append, connect
93-
from .pzmap import pzmap
94-
from .statefbk import ctrb, obsv, gram, place, lqr
95-
from .delay import pade
96-
from .modelsimp import hsvd, balred, modred, minreal
97-
from .mateqn import lyap, dlyap, dare, care
89+
from ..ctrlutil import unwrap
90+
from ..freqplot import nyquist, gangof4
91+
from ..nichols import nichols, nichols_grid
92+
from ..bdalg import series, parallel, negate, feedback, append, connect
93+
from ..pzmap import pzmap
94+
from ..statefbk import ctrb, obsv, gram, place, lqr
95+
from ..delay import pade
96+
from ..modelsimp import hsvd, balred, modred, minreal
97+
from ..mateqn import lyap, dlyap, dare, care
9898

9999
__doc__ += r"""
100100
The following tables give an overview of the module ``control.matlab``.
@@ -1076,7 +1076,6 @@ def bode(*args, **keywords):
10761076
return freqplot.bode(syslist, omega, **keywords)
10771077

10781078
# Nichols chart grid
1079-
from .nichols import nichols_grid
10801079
def ngrid():
10811080
nichols_grid()
10821081
ngrid.__doc__ = re.sub('nichols_grid', 'ngrid', nichols_grid.__doc__)
@@ -1111,7 +1110,7 @@ def rlocus(sys, klist = None, **keywords):
11111110
klist:
11121111
list of gains used to compute roots
11131112
"""
1114-
from .rlocus import root_locus
1113+
from ..rlocus import root_locus
11151114

11161115
return root_locus(sys, klist, **keywords)
11171116

0 commit comments

Comments
 (0)
0