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

Commit31e6944

Browse files
authored
Merge pull request#265 from don4get/refactor/xferfcn.py
Clean up of xferfcn.py (PEP8, etc)
2 parentsbe59f62 +5731918 commit31e6944

File tree

8 files changed

+351
-365
lines changed

8 files changed

+351
-365
lines changed

‎control/bdalg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@ def feedback(sys1, sys2=1, sign=-1):
239239
# its feedback member function.
240240
ifisinstance(sys1, (int,float,complex,np.number)):
241241
ifisinstance(sys2,tf.TransferFunction):
242-
sys1=tf._convertToTransferFunction(sys1)
242+
sys1=tf._convert_to_transfer_function(sys1)
243243
elifisinstance(sys2,ss.StateSpace):
244244
sys1=ss._convertToStateSpace(sys1)
245245
elifisinstance(sys2,frd.FRD):
246246
sys1=ss._convertToFRD(sys1)
247247
else:# sys2 is a scalar.
248-
sys1=tf._convertToTransferFunction(sys1)
249-
sys2=tf._convertToTransferFunction(sys2)
248+
sys1=tf._convert_to_transfer_function(sys1)
249+
sys2=tf._convert_to_transfer_function(sys2)
250250

251251
returnsys1.feedback(sys2,sign)
252252

‎control/margins.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def stability_margins(sysdata, returnall=False, epsw=0.0):
144144
sys=frdata.FRD(mag*np.exp(1j*phase*math.pi/180),
145145
omega,smooth=True)
146146
else:
147-
sys=xferfcn._convertToTransferFunction(sysdata)
147+
sys=xferfcn._convert_to_transfer_function(sysdata)
148148
exceptExceptionase:
149149
print (e)
150150
raiseValueError("Margin sysdata must be either a linear system or "
@@ -299,7 +299,7 @@ def phase_crossover_frequencies(sys):
299299
"""
300300

301301
# Convert to a transfer function
302-
tf=xferfcn._convertToTransferFunction(sys)
302+
tf=xferfcn._convert_to_transfer_function(sys)
303303

304304
# if not siso, fall back to (0,0) element
305305
#! TODO: should add a check and warning here

‎control/rlocus.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
frommathimportpi
5252
importscipy.signal# signal processing toolbox
5353
importpylab# plotting routines
54-
from .xferfcnimport_convertToTransferFunction
54+
from .xferfcnimport_convert_to_transfer_function
5555
from .exceptionimportControlMIMONotImplemented
5656
fromfunctoolsimportpartial
5757
from .ltiimportisdtime
@@ -288,7 +288,7 @@ def _systopoly1d(sys):
288288

289289
else:
290290
# Convert to a transfer function, if needed
291-
sys=_convertToTransferFunction(sys)
291+
sys=_convert_to_transfer_function(sys)
292292

293293
# Make sure we have a SISO system
294294
if (sys.inputs>1orsys.outputs>1):

‎control/statesp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
fromscipy.signalimportlti,cont2discrete
6363
fromwarningsimportwarn
6464
from .ltiimportLTI,timebase,timebaseEqual,isdtime
65-
from .xferfcnimport_convertToTransferFunction
65+
from .xferfcnimport_convert_to_transfer_function
6666
fromcopyimportdeepcopy
6767

6868
__all__= ['StateSpace','ss','rss','drss','tf2ss','ssdata']

‎control/tests/timeresp_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# import scipy as sp
1414
fromcontrol.timerespimport*
1515
fromcontrol.statespimport*
16-
fromcontrol.xferfcnimportTransferFunction,_convertToTransferFunction
16+
fromcontrol.xferfcnimportTransferFunction,_convert_to_transfer_function
1717
fromcontrol.dtimeimportc2d
1818
fromcontrol.exceptionimportslycot_check
1919

@@ -28,7 +28,7 @@ def setUp(self):
2828

2929
# Create some transfer functions
3030
self.siso_tf1=TransferFunction([1], [1,2,1])
31-
self.siso_tf2=_convertToTransferFunction(self.siso_ss1)
31+
self.siso_tf2=_convert_to_transfer_function(self.siso_ss1)
3232

3333
# Create MIMO system, contains ``siso_ss1`` twice
3434
A=np.matrix("1. -2. 0. 0.;"

0 commit comments

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