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

Fix doc escape#674

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.

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

Already on GitHub?Sign in to your account

Merged
murrayrm merged 2 commits intopython-control:masterfrombnavigator:fix-doc-escape
Nov 27, 2021
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
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
13 changes: 8 additions & 5 deletionscontrol/bdalg.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,9 @@


def series(sys1, *sysn):
"""Return the series connection (sysn \\* ... \\*) sys2 \\* sys1
r"""series(sys1, sys2, [..., sysn])

Return the series connection (`sysn` \* ...\ \*) `sys2` \* `sys1`.

Parameters
----------
Expand DownExpand Up@@ -107,8 +109,9 @@ def series(sys1, *sysn):


def parallel(sys1, *sysn):
"""
Return the parallel connection sys1 + sys2 (+ ... + sysn)
r"""parallel(sys1, sys2, [..., sysn])

Return the parallel connection `sys1` + `sys2` (+ ...\ + `sysn`).

Parameters
----------
Expand DownExpand Up@@ -252,9 +255,9 @@ def feedback(sys1, sys2=1, sign=-1):
return sys1.feedback(sys2, sign)

def append(*sys):
"""append(sys1, sys2, ..., sysn)
"""append(sys1, sys2,[..., sysn])

Group models by appending their inputs and outputs
Group models by appending their inputs and outputs.

Forms an augmented system model, and appends the inputs and
outputs together. The system type will be the type of the first
Expand Down
10 changes: 0 additions & 10 deletionsdoc/control.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,16 +71,6 @@ Time domain simulation
step_response
phase_plot

Block diagram algebra
=====================
.. autosummary::
:toctree: generated/

series
parallel
feedback
negate

Control system analysis
=======================
.. autosummary::
Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp