Skip to content

Commit bfdfbd5

Browse files
murrayrmmurrayrm
authored
Merge pull request #915 from murrayrm/iosys_renaming-19Jun2023
Rename files/modules in preparation for I/O system changes
2 parents 8c49b09 + ad83edc commit bfdfbd5

31 files changed

+4266
-4227
lines changed

‎control/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
from .margins import *
7878
from .mateqn import *
7979
from .modelsimp import *
80-
from .namedio import *
80+
from .iosys import *
8181
from .nichols import *
8282
from .phaseplot import *
8383
from .pzmap import *
@@ -93,7 +93,7 @@
9393
from .robust import *
9494
from .config import *
9595
from .sisotool import *
96-
from .iosys import *
96+
from .nlsys import *
9797
from .passivity import *
9898

9999
# Exceptions

‎control/canonical.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# RMM, 10 Nov 2012
33

44
from .exception import ControlNotImplemented, ControlSlycot
5-
from .namedio import issiso
5+
from .iosys import issiso
66
from .statesp import StateSpace, _convert_to_statespace
77
from .statefbk import ctrb, obsv
88

‎control/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def reset_defaults():
123123
from .sisotool import _sisotool_defaults
124124
defaults.update(_sisotool_defaults)
125125

126-
from .namedio import _namedio_defaults
126+
from .iosys import _namedio_defaults
127127
defaults.update(_namedio_defaults)
128128

129129
from .xferfcn import _xferfcn_defaults
@@ -132,7 +132,7 @@ def reset_defaults():
132132
from .statesp import _statesp_defaults
133133
defaults.update(_statesp_defaults)
134134

135-
from .iosys import _iosys_defaults
135+
from .nlsys import _iosys_defaults
136136
defaults.update(_iosys_defaults)
137137

138138
from .optimal import _optimal_defaults

‎control/dtime.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
4848
"""
4949

50-
from .namedio import isctime
50+
from .iosys import isctime
5151
from .statesp import StateSpace
5252

5353
__all__ = ['sample_system', 'c2d']
@@ -127,4 +127,4 @@ def sample_system(sysc, Ts, method='zoh', alpha=None, prewarp_frequency=None,
127127
method=method, alpha=alpha, prewarp_frequency=prewarp_frequency,
128128
name=name, copy_names=copy_names, **kwargs)
129129

130-
c2d = sample_system
130+
c2d = sample_system

‎control/flatsys/flatsys.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import warnings
4646
from .poly import PolyFamily
4747
from .systraj import SystemTrajectory
48-
from ..iosys import NonlinearIOSystem
48+
from ..nlsys import NonlinearIOSystem
4949
from ..timeresp import _check_convert_array
5050

5151

‎control/flatsys/linflat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import numpy as np
3939
import control
4040
from .flatsys import FlatSystem
41-
from ..iosys import LinearIOSystem
41+
from ..statesp import LinearIOSystem
4242

4343

4444
class LinearFlatSystem(FlatSystem, LinearIOSystem):

‎control/frdata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
from .lti import LTI, _process_frequency_response
5656
from .exception import pandas_check
57-
from .namedio import NamedIOSystem, _process_namedio_keywords
57+
from .iosys import NamedIOSystem, _process_namedio_keywords
5858
from . import config
5959

6060
__all__ = ['FrequencyResponseData', 'FRD', 'frd']

0 commit comments

Comments
 (0)