Merge pull request #880 from murrayrm/smallfixes-26Mar2023 · python-control/python-control@999189c
@@ -22,14 +22,17 @@ Python Control Systems Library
2222The Python Control Systems Library is a Python module that implements basic
2323operations for analysis and design of feedback control systems.
242425-2625Have a go now!
27-==============
26+--------------
2827Try out the examples in the examples folder using the binder service.
29283029.. image:: https://mybinder.org/badge_logo.svg
3130:target: https://mybinder.org/v2/gh/python-control/python-control/HEAD
323132+The package can also be installed on Google Colab using the commands::
33+34+ !pip install control
35+ import control as ct
33363437Features
3538--------
@@ -44,17 +47,16 @@ Features
4447- Nonlinear systems: optimization-based control, describing functions, differential flatness
45484649Links
47-=====
50+-----
48514952- Project home page: http://python-control.org
5053- Source code repository: https://github.com/python-control/python-control
5154- Documentation: http://python-control.readthedocs.org/
5255- Issue tracker: https://github.com/python-control/python-control/issues
5356- Mailing list: http://sourceforge.net/p/python-control/mailman/
545755-5658Dependencies
57-============
59+------------
58605961The package requires numpy, scipy, and matplotlib. In addition, some routines
6062use a module called slycot, that is a Python wrapper around some FORTRAN
@@ -64,6 +66,7 @@ functionality is limited or absent, and installation of slycot is recommended
64666567https://github.com/python-control/Slycot
666869+6770Installation
6871============
6972@@ -73,7 +76,7 @@ Conda and conda-forge
7376The easiest way to get started with the Control Systems library is
7477using `Conda <https://conda.io>`_.
757876-The Control Systems library has been packages for the `conda-forge
79+The Control Systems library has packages available using the `conda-forge
7780<https://conda-forge.org>`_ Conda channel, and as of Slycot version
78810.3.4, binaries for that package are available for 64-bit Windows,
7982OSX, and Linux.
@@ -83,6 +86,10 @@ conda environment, run::
83868487 conda install -c conda-forge control slycot
858889+Mixing packages from conda-forge and the default conda channel can
90+sometimes cause problems with dependencies, so it is usually best to
91+instally NumPy, SciPy, and Matplotlib from conda-forge as well.
92+8693Pip
8794---
8895@@ -92,7 +99,8 @@ To install using pip::
9299 pip install control
9310094101If you install Slycot using pip you'll need a development environment
95-(e.g., Python development files, C and Fortran compilers).
102+(e.g., Python development files, C and Fortran compilers). Pip
103+installation can be particularly complicated for Windows.
9610497105Installing from source
98106----------------------
@@ -106,11 +114,13 @@ toplevel `python-control` directory::
106114Article and Citation Information
107115================================
108116109-An `article <https://ieeexplore.ieee.org/abstract/document/9683368>`_ about the library is available on IEEE Explore. If the Python Control Systems Library helped you in your research, please cite::
117+An `article <https://ieeexplore.ieee.org/abstract/document/9683368>`_ about
118+the library is available on IEEE Explore. If the Python Control Systems Library helped you in your research, please cite::
110119111120 @inproceedings{python-control2021,
112121 title={The Python Control Systems Library (python-control)},
113- author={Fuller, Sawyer and Greiner, Ben and Moore, Jason and Murray, Richard and van Paassen, Ren{\'e} and Yorke, Rory},
122+ author={Fuller, Sawyer and Greiner, Ben and Moore, Jason and
123+ Murray, Richard and van Paassen, Ren{\'e} and Yorke, Rory},
114124 booktitle={60th IEEE Conference on Decision and Control (CDC)},
115125 pages={4875--4881},
116126 year={2021},