Skip to content

Fix timebase docs #180

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
merged 5 commits into from
Jan 6, 2018
Merged

Fix timebase docs #180

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
558c1b9
Merge branch 'master' of https://github.com/python-control/python-con…
murrayrm Jan 2, 2018
54d41aa
Merge branch 'master' of https://github.com/python-control/python-con…
murrayrm Jan 2, 2018
9405886
Merge branch 'master' of https://github.com/python-control/python-con…
murrayrm Jan 3, 2018
ee30983
Merge branch 'master' of https://github.com/python-control/python-con…
murrayrm Jan 5, 2018
06b9a6f
DOC: update timebase documentation
murrayrm Jan 5, 2018
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
5 changes: 3 additions & 2 deletions doc/conventions.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ By default, all systems are considered to be continuous time systems. A
discrete time system is created by specifying the 'time base' dt. The time
base argument can be given when a system is constructed:

* dt = None: continuous time
* dt = number: discrete time system with sampling period 'dt'
* dt = None: no timebase specified
* dt = 0: continuous time system
* dt > 0: discrete time system with sampling period 'dt'
* dt = True: discrete time with unspecified sampling period

Only the :class:`StateSpace` and :class:`TransferFunction` classes allow
Expand Down