Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfaa1d72

Browse files
committed
updated isort's + remove extraneous spaces
1 parent168977e commitfaa1d72

File tree

11 files changed

+39
-27
lines changed

11 files changed

+39
-27
lines changed

‎control/bdalg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ def split_tf(transfer_function):
637637
array([1, 1]),
638638
name='G', outputs=1, inputs=1)]],
639639
dtype=object)
640-
640+
641641
"""
642642
tf_split_lst= []
643643
fori_outinrange(transfer_function.noutputs):

‎control/flatsys/__init__.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,11 @@
2929

3030
# Basis function families
3131
from .basisimportBasisFamily
32-
from .polyimportPolyFamily
3332
from .bezierimportBezierFamily
3433
from .bsplineimportBSplineFamily
35-
34+
# Package functions
35+
from .flatsysimportFlatSystem,flatsys,point_to_point,solve_flat_ocp
36+
from .linflatimportLinearFlatSystem
37+
from .polyimportPolyFamily
3638
# Classes
3739
from .systrajimportSystemTrajectory
38-
from .flatsysimportFlatSystem,flatsys
39-
from .linflatimportLinearFlatSystem
40-
41-
# Package functions
42-
from .flatsysimportpoint_to_point,solve_flat_ocp

‎control/flatsys/bezier.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
importnumpyasnp
1515
fromscipy.specialimportbinom,factorial
16+
1617
from .basisimportBasisFamily
1718

19+
1820
classBezierFamily(BasisFamily):
1921
r"""Bezier curve basis functions.
2022

‎control/flatsys/bspline.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
"""
1111

1212
importnumpyasnp
13-
from .basisimportBasisFamily
1413
fromscipy.interpolateimportBSpline,splev
1514

15+
from .basisimportBasisFamily
16+
17+
1618
classBSplineFamily(BasisFamily):
1719
"""B-spline basis functions.
1820

‎control/flatsys/linflat.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
66
"""
77

8-
importnumpyasnp
98
importcontrol
10-
from .flatsysimportFlatSystem
9+
importnumpyasnp
10+
1111
from ..statespimportStateSpace
12+
from .flatsysimportFlatSystem
1213

1314

1415
classLinearFlatSystem(FlatSystem,StateSpace):

‎control/flatsys/poly.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212

1313
importnumpyasnp
1414
fromscipy.specialimportfactorial
15+
1516
from .basisimportBasisFamily
1617

18+
1719
classPolyFamily(BasisFamily):
1820
r"""Polynomial basis functions.
1921

‎control/lti.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88
"""
99

1010
importmath
11+
fromtypingimportCallable
1112
fromwarningsimportwarn
1213

1314
importnumpyasnp
1415
fromnumpyimportabs,angle,real
1516

17+
importcontrol
18+
1619
from .importconfig
1720
from .iosysimportInputOutputSystem
18-
importcontrol
19-
fromtypingimportCallable
2021

2122
__all__= ['poles','zeros','damp','evalfr','frequency_response',
2223
'freqresp','dcgain','bandwidth','LTI']
@@ -216,7 +217,7 @@ def ispassive(self):
216217
# importing here prevents circular dependancy
217218
fromcontrol.passivityimportispassive
218219
returnispassive(self)
219-
220+
220221
deffeedback(self,other=1,sign=-1):
221222
raiseNotImplementedError(f"feedback not implemented for base{self.__class__.__name__} objects")
222223

‎control/matlab/wrappers.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@
44
55
"""
66

7-
importnumpyasnp
8-
fromscipy.signalimportzpk2tf
97
importwarnings
108
fromwarningsimportwarn
119

10+
importnumpyasnp
11+
fromscipy.signalimportzpk2tf
12+
13+
from ..exceptionimportControlArgument
14+
from ..ltiimportLTI
1215
from ..statespimportss
1316
from ..xferfcnimporttf
14-
from ..ltiimportLTI
15-
from ..exceptionimportControlArgument
1617

1718
__all__= ['bode','nyquist','ngrid','rlocus','pzmap','dcgain','connect']
1819

@@ -127,7 +128,7 @@ def nyquist(*args, plot=True, **kwargs):
127128
Frequencies in rad/s.
128129
129130
"""
130-
from ..freqplotimportnyquist_response,nyquist_plot
131+
from ..freqplotimportnyquist_plot,nyquist_response
131132

132133
# If first argument is a list, assume python-control calling format
133134
ifhasattr(args[0],'__iter__'):
@@ -311,6 +312,8 @@ def pzmap(*args, **kwargs):
311312

312313

313314
from ..nicholsimportnichols_grid
315+
316+
314317
defngrid():
315318
returnnichols_grid()
316319
ngrid.__doc__=nichols_grid.__doc__
@@ -378,6 +381,8 @@ def dcgain(*args):
378381

379382

380383
from ..bdalgimportconnectasct_connect
384+
385+
381386
defconnect(*args):
382387
"""connect(sys, Q, inputv, outputv)
383388

‎control/nlsys.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
from .importconfig
2626
from .iosysimportInputOutputSystem,_parse_spec,_process_iosys_keywords, \
2727
_process_signal_list,common_timebase,iosys_repr,isctime,isdtime
28-
from .timerespimport_check_convert_array,_process_time_response, \
29-
TimeResponseData,TimeResponseList
28+
from .timerespimportTimeResponseData,TimeResponseList, \
29+
_check_convert_array,_process_time_response
3030

3131
__all__= ['NonlinearIOSystem','InterconnectedSystem','nlsys',
3232
'input_output_response','find_eqpt','linearize',

‎control/statesp.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
importnumpyasnp
2222
importscipyassp
2323
importscipy.linalg
24-
fromnumpyimportany,array,asarray,concatenate,cos,delete,empty, \
25-
exp,eye,isinf,ones,pad,sin,squeeze,zeros
24+
fromnumpyimportany,array,asarray,concatenate,cos,delete,empty,exp,\
25+
eye,isinf,ones,pad,sin,squeeze,zeros
2626
fromnumpy.linalgimportLinAlgError,eigvals,matrix_rank,solve
2727
fromnumpy.randomimportrand,randn
2828
fromscipy.signalimportStateSpaceassignalStateSpace
2929
fromscipy.signalimportcont2discrete
3030

31+
importcontrol
32+
3133
from .importconfig
3234
from .exceptionimportControlMIMONotImplemented,ControlSlycot,slycot_check
3335
from .frdataimportFrequencyResponseData
@@ -36,7 +38,6 @@
3638
common_timebase,iosys_repr,isdtime,issiso
3739
from .ltiimportLTI,_process_frequency_response
3840
from .nlsysimportInterconnectedSystem,NonlinearIOSystem
39-
importcontrol
4041

4142
try:
4243
fromslycotimportab13dd
@@ -1432,7 +1433,7 @@ def output(self, t, x, u=None, params=None):
14321433
raiseValueError("len(u) must be equal to number of inputs")
14331434
return (self.C @x).reshape((-1,)) \
14341435
+ (self.D @u).reshape((-1,))# return as row vector
1435-
1436+
14361437
# convenience aliase, import needs to go over the submodule to avoid circular imports
14371438
initial_response=control.timeresp.initial_response
14381439

‎control/sysnorm.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
"""Functions for computing system norms."""
77

8+
importwarnings
9+
810
importnumpyasnp
9-
importscipyassp
1011
importnumpy.linalgasla
11-
importwarnings
12+
importscipyassp
1213

1314
importcontrolasct
1415

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp