Skip to content

fix discrete-time simulation time output #286

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
repagh merged 2 commits into from
Apr 11, 2019
Merged

fix discrete-time simulation time output #286

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11b7797
fixed discrete-time simulation time output
murrayrm Apr 10, 2019
14261cc
quick fix for default time vector for discrete time initial condition…
murrayrm Apr 10, 2019
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
quick fix for default time vector for discrete time initial condition… 
… and impulse response
  • Loading branch information
@murrayrm
murrayrm committed Apr 10, 2019
commit 14261cc269f7d2707f15b31dfcadbfbe70c6f1a3
15 changes: 13 additions & 2 deletions control/timeresp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,12 @@ def initial_response(sys, T=None, X0=0., input=0, output=None,
# Create time and input vectors; checking is done in forced_response(...)
# The initial vector X0 is created in forced_response(...) if necessary
if T is None:
T = _default_response_times(sys.A, 100)
if isctime(sys):
T = _default_response_times(sys.A, 1000)
else:
# For discrete time, use integers
tvec = _default_response_times(sys.A, 1000)
T = range(int(np.ceil(max(tvec))))
U = np.zeros_like(T)

T, yout, _xout = forced_response(sys, T, U, X0, transpose=transpose)
Expand Down Expand Up @@ -707,7 +712,13 @@ def impulse_response(sys, T=None, X0=0., input=0, output=None,

# Compute T and U, no checks necessary, they will be checked in lsim
if T is None:
T = _default_response_times(sys.A, 100)
if isctime(sys):
T = _default_response_times(sys.A, 100)
else:
# For discrete time, use integers
tvec = _default_response_times(sys.A, 100)
T = range(int(np.ceil(max(tvec))))

U = np.zeros_like(T)

# Compute new X0 that contains the impulse
Expand Down