Skip to content

Commit b3693dc

Browse files
committed
updates per @sawyerbfuller review comments
1 parent de38612 commit b3693dc

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

control/bdalg.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,9 @@ def append(*sys):
332332
def connect(sys, Q, inputv, outputv):
333333
"""Index-based interconnection of an LTI system.
334334
335-
.. deprecated:: 0.10.0
336-
`connect` will be removed in a future version of python-control in
337-
favor of `interconnect`, which works with named signals.
335+
.. deprecated:: 0.10.0
336+
`connect` will be removed in a future version of python-control in
337+
favor of `interconnect`, which works with named signals.
338338
339339
The system `sys` is a system typically constructed with `append`, with
340340
multiple inputs and outputs. The inputs and outputs are connected
@@ -380,10 +380,9 @@ def connect(sys, Q, inputv, outputv):
380380
381381
Notes
382382
-----
383-
The :func:`~control.interconnect` function in the
384-
:ref:`input/output systems <iosys-module>` module allows the use
385-
of named signals and provides an alternative method for
386-
interconnecting multiple systems.
383+
The :func:`~control.interconnect` function in the :ref:`input/output
384+
systems <iosys-module>` module allows the use of named signals and
385+
provides an alternative method for interconnecting multiple systems.
387386
388387
"""
389388
# TODO: maintain `connect` for use in MATLAB submodule (?)

control/sisotool.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ def rootlocus_pid_designer(plant, gain='P', sign=+1, input_signal='r',
341341

342342
if derivative_in_feedback_path:
343343
deriv = -deriv
344+
deriv.input_labels = 'e'
344345

345346
# create gain blocks
346347
Kpgain = tf(Kp0, 1, inputs='prop_e', outputs='ufb')

control/statesp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1597,8 +1597,8 @@ def ss(*args, **kwargs):
15971597
if len(args) > 0 and (hasattr(args[0], '__call__') or args[0] is None) \
15981598
and not isinstance(args[0], (InputOutputSystem, LTI)):
15991599
# Function as first (or second) argument => assume nonlinear IO system
1600-
warn("use nlsys() to create nonlinear I/O System",
1601-
PendingDeprecationWarning)
1600+
warn("using ss to create nonlinear I/O systems is deprecated; "
1601+
"use nlsys", DeprecationWarning)
16021602
return NonlinearIOSystem(*args, **kwargs)
16031603

16041604
elif len(args) == 4 or len(args) == 5:

control/timeresp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ def step_response(sys, T=None, X0=0, input=None, output=None, T_num=None,
12461246
many simulation steps.
12471247
12481248
X0 : array_like or float, optional
1249-
Initial condition (default = 0). This can be used for nonlinear
1249+
Initial condition (default = 0). This can be used for a nonlinear
12501250
system where the origin is not an equilibrium point.
12511251
12521252
input : int, optional

0 commit comments

Comments
 (0)