Skip to content

Small documentation updates #123

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
slivingston merged 10 commits into from
Dec 31, 2016
Merged

Small documentation updates #123

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dbf0a9d
DOC: updated Slycot URL to github.com/python-control
murrayrm Dec 27, 2016
4cbd4cb
DOC: default method for sample_system was incorrect
murrayrm Dec 27, 2016
06b5fe4
DOC: created conventions section in manual + moved doc for time serie…
murrayrm Dec 27, 2016
c253d33
DOC: added documentation for return_x
murrayrm Dec 27, 2016
2111117
DOC: removed redundant entries for frequency domain plots
murrayrm Dec 27, 2016
1f15678
add robust module to list of included files
murrayrm Dec 27, 2016
92570bc
TRV: use double quotes for multi-line comment
murrayrm Dec 27, 2016
303480f
DOC: add missing functions to documentation list
murrayrm Dec 27, 2016
93b50b1
Add documentation for custom configurations
murrayrm Dec 27, 2016
349025b
DOC: updated installation instructions (including conda as an option)
murrayrm Dec 29, 2016
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
DOC: default method for sample_system was incorrect
  • Loading branch information
@murrayrm
murrayrm committed Dec 27, 2016
commit 4cbd4cbe0d2a3105e946b01d0bbd0171a08171e3
2 changes: 1 addition & 1 deletion control/dtime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def sample_system(sysc, Ts, method='zoh', alpha=None):
Ts : real
Sampling period
method : string
Method to use for conversion: 'matched' (default), 'tustin', 'zoh'
Method to use for conversion: 'matched', 'tustin', 'zoh' (default)

Returns
-------
Expand Down