Skip to content

new examples for Simulink-like interconnection of digital and nonlinear systems #882

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 our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
11 changes: 8 additions & 3 deletions doc/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Examples
The source code for the examples below are available in the `examples/`
subdirecory of the source code distribution. The can also be accessed online
via the [python-control GitHub repository](https://github.com/python-control/python-control/tree/master/examples).


Python scripts
==============
Expand Down Expand Up @@ -37,17 +37,22 @@ Jupyter notebooks

The examples below use `python-control` in a Jupyter notebook environment.
These notebooks demonstrate the use of modeling, anaylsis, and design tools
using running examples in FBS2e.
using examples from textbooks
(`FBS <https://fbswiki.org/wiki/index.php?title=FBS>`_,
`OBC <https://fbswiki.org/wiki/index.php?title=OBC>`_), courses, and other
online sources.

.. toctree::
:maxdepth: 1

cruise
describing_functions
interconnect_tutorial
Copy link
Member

@murrayrm murrayrm Apr 8, 2023

Choose a reason for hiding this comment

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

We should probably update the introductory text at the top of this section since the Jupyter notebooks in this section are no longer using running examples in FBS2e (true before this change, but I noticed it now). How about something like:

These notebooks demonstrate the use of modeling, anaylsis, and design tools
using examples from textbooks (FBS2e, OBC), courses, and other sources.

(links would have to be done differently, but using GitHub markup here to show where the links go).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sounds good. INcorporated the suggested rewording.

Also improved the name on one of the examples and switched to lists for specifying set of interconnected systems according to upcoming changes in interconnect.

kincar-fusion
mhe-pvtol
mpc_aircraft
steering
pvtol-lqr-nested
pvtol-outputfbk
simulating_discrete_nonlinear
steering
stochresp
363 changes: 363 additions & 0 deletions examples/interconnect_tutorial.ipynb

Large diffs are not rendered by default.

585 changes: 585 additions & 0 deletions examples/simulating_discrete_nonlinear.ipynb

Large diffs are not rendered by default.