Skip to content

Rename files/modules in preparation for I/O system changes #915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 19, 2023
Merged

Rename files/modules in preparation for I/O system changes #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions control/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
from .margins import *
from .mateqn import *
from .modelsimp import *
from .namedio import *
from .iosys import *
from .nichols import *
from .phaseplot import *
from .pzmap import *
Expand All @@ -93,7 +93,7 @@
from .robust import *
from .config import *
from .sisotool import *
from .iosys import *
from .nlsys import *
from .passivity import *

# Exceptions
Expand Down
2 changes: 1 addition & 1 deletion control/canonical.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# RMM, 10 Nov 2012

from .exception import ControlNotImplemented, ControlSlycot
from .namedio import issiso
from .iosys import issiso
from .statesp import StateSpace, _convert_to_statespace
from .statefbk import ctrb, obsv

Expand Down
4 changes: 2 additions & 2 deletions control/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def reset_defaults():
from .sisotool import _sisotool_defaults
defaults.update(_sisotool_defaults)

from .namedio import _namedio_defaults
from .iosys import _namedio_defaults
defaults.update(_namedio_defaults)

from .xferfcn import _xferfcn_defaults
Expand All @@ -132,7 +132,7 @@ def reset_defaults():
from .statesp import _statesp_defaults
defaults.update(_statesp_defaults)

from .iosys import _iosys_defaults
from .nlsys import _iosys_defaults
defaults.update(_iosys_defaults)

from .optimal import _optimal_defaults
Expand Down
4 changes: 2 additions & 2 deletions control/dtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

"""

from .namedio import isctime
from .iosys import isctime
from .statesp import StateSpace

__all__ = ['sample_system', 'c2d']
Expand Down Expand Up @@ -127,4 +127,4 @@ def sample_system(sysc, Ts, method='zoh', alpha=None, prewarp_frequency=None,
method=method, alpha=alpha, prewarp_frequency=prewarp_frequency,
name=name, copy_names=copy_names, **kwargs)

c2d = sample_system
c2d = sample_system
2 changes: 1 addition & 1 deletion control/flatsys/flatsys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import warnings
from .poly import PolyFamily
from .systraj import SystemTrajectory
from ..iosys import NonlinearIOSystem
from ..nlsys import NonlinearIOSystem
from ..timeresp import _check_convert_array


Expand Down
2 changes: 1 addition & 1 deletion control/flatsys/linflat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import numpy as np
import control
from .flatsys import FlatSystem
from ..iosys import LinearIOSystem
from ..statesp import LinearIOSystem


class LinearFlatSystem(FlatSystem, LinearIOSystem):
Expand Down
2 changes: 1 addition & 1 deletion control/frdata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@

from .lti import LTI, _process_frequency_response
from .exception import pandas_check
from .namedio import NamedIOSystem, _process_namedio_keywords
from .iosys import NamedIOSystem, _process_namedio_keywords
from . import config

__all__ = ['FrequencyResponseData', 'FRD', 'frd']
Expand Down
Loading