Skip to content

fix parallel input or output interconnect bug (issue #1015) #1017

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
murrayrm merged 5 commits into from
Jul 7, 2024
Merged

fix parallel input or output interconnect bug (issue #1015) #1017

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e872f8
fix interconnect() issue #1015
murrayrm Jun 29, 2024
421131c
updated documentation per comment from @bonidydy in #1015
murrayrm Jun 30, 2024
1964a86
code cleanup
murrayrm Jul 2, 2024
9a78e33
fix type pointed out by @sawyerbfuller
murrayrm Jul 2, 2024
584f39d
fixed small indent error
murrayrm Jul 7, 2024
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
Prev Previous commit
Next Next commit
updated documentation per comment from @bonidydy in #1015
  • Loading branch information
@murrayrm
murrayrm committed Jun 30, 2024
commit 421131ceb316a0d8c838e187714de7c88976c0aa
15 changes: 6 additions & 9 deletions control/nlsys.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2086,10 +2086,8 @@ def interconnect(

inplist : list of input connections, optional
List of connections for how the inputs for the overall system are
mapped to the subsystem inputs. The input specification is similar to
the form defined in the connection specification, except that
connections do not specify an input-spec, since these are the system
inputs. The entries for a connection are thus of the form:
mapped to the subsystem inputs. The entries for a connection are
of the form:

[input-spec1, input-spec2, ...]

Expand All @@ -2102,11 +2100,10 @@ def interconnect(

outlist : list of output connections, optional
List of connections for how the outputs from the subsystems are
mapped to overall system outputs. The output connection
description is the same as the form defined in the inplist
specification (including the optional gain term). Numbered outputs
must be chosen from the list of subsystem outputs, but named
outputs can also be contained in the list of subsystem inputs.
mapped to overall system outputs. The entris for a connection are

@sawyerbfuller sawyerbfuller Jul 2, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo: “entries”

of the form:

[output-spec1, output-spec2, ...]

If an output connection contains more than one signal specification,
then those signals are added together (multiplying by the any gain
Expand Down