Skip to content

Fix matlab.stepinfo() #444

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 1 commit into from
Aug 17, 2020
Merged

Fix matlab.stepinfo() #444

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions control/matlab/timeresp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def step(sys, T=None, X0=0., input=0, output=None, return_x=False):
LTI system to simulate

T: array-like or number, optional
Time vector, or simulation time duration if a number (time vector is
Time vector, or simulation time duration if a number (time vector is
autocomputed if not given)

X0: array-like or number, optional
Expand Down Expand Up @@ -67,7 +67,7 @@ def step(sys, T=None, X0=0., input=0, output=None, return_x=False):

return yout, T

def stepinfo(sys, T=None, SettlingTimeThreshold=0.02, RiseTimeLimits=(0.1,0.9)):
def stepinfo(sys, T=None, SettlingTimeThreshold=0.02, RiseTimeLimits=(0.1, 0.9)):
'''
Step response characteristics (Rise time, Settling Time, Peak and others).

Expand All @@ -77,7 +77,7 @@ def stepinfo(sys, T=None, SettlingTimeThreshold=0.02, RiseTimeLimits=(0.1,0.9)):
LTI system to simulate

T: array-like or number, optional
Time vector, or simulation time duration if a number (time vector is
Time vector, or simulation time duration if a number (time vector is
autocomputed if not given)

SettlingTimeThreshold: float value, optional
Expand Down Expand Up @@ -110,7 +110,7 @@ def stepinfo(sys, T=None, SettlingTimeThreshold=0.02, RiseTimeLimits=(0.1,0.9)):
'''
from ..timeresp import step_info

S = step_info(sys, T, SettlingTimeThreshold, RiseTimeLimits)
S = step_info(sys, T, None, SettlingTimeThreshold, RiseTimeLimits)

return S

Expand All @@ -130,9 +130,9 @@ def impulse(sys, T=None, X0=0., input=0, output=None, return_x=False):
LTI system to simulate

T: array-like or number, optional
Time vector, or simulation time duration if a number (time vector is
Time vector, or simulation time duration if a number (time vector is
autocomputed if not given)

X0: array-like or number, optional
Initial condition (default = 0)

Expand Down Expand Up @@ -186,9 +186,9 @@ def initial(sys, T=None, X0=0., input=None, output=None, return_x=False):
LTI system to simulate

T: array-like or number, optional
Time vector, or simulation time duration if a number (time vector is
Time vector, or simulation time duration if a number (time vector is
autocomputed if not given)

X0: array-like object or number, optional
Initial condition (default = 0)

Expand Down