Skip to content

fix computation of default response time for constant systems #383

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
murrayrm merged 2 commits into from
May 17, 2020
Merged

fix computation of default response time for constant systems #383

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bad487
fix computation of default response time for constant systems
murrayrm Mar 22, 2020
98f13be
add single function to compute response times
murrayrm Mar 24, 2020
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
Next Next commit
fix computation of default response time for constant systems
  • Loading branch information
@murrayrm
murrayrm committed Mar 22, 2020
commit 4bad487bd8748261e10d3eb3db8f76d2824ee59e
14 changes: 13 additions & 1 deletion control/tests/timeresp_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,21 @@ def test_step_response(self):
np.testing.assert_array_equal(Tc.shape, Td.shape)
np.testing.assert_array_equal(youtc.shape, youtd.shape)

# Recreate issue #374 ("Bug in step_response()")
def test_step_nostates(self):
# Continuous time, constant system
sys = TransferFunction([1], [1])
t, y = step_response(sys)
np.testing.assert_array_equal(y, np.ones(len(t)))

# Discrete time, constant system
sys = TransferFunction([1], [1], 1)
t, y = step_response(sys)
np.testing.assert_array_equal(y, np.ones(len(t)))

def test_step_info(self):
# From matlab docs:
sys = TransferFunction([1,5,5],[1,1.65,5,6.5,2])
sys = TransferFunction([1, 5, 5], [1, 1.65, 5, 6.5, 2])
Strue = {
'RiseTime': 3.8456,
'SettlingTime': 27.9762,
Expand Down
60 changes: 46 additions & 14 deletions control/timeresp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,19 @@ def step_response(sys, T=None, X0=0., input=None, output=None,
sys = _get_ss_simo(sys, input, output)
if T is None:
if isctime(sys):
T = _default_response_times(sys.A, 100)
if sys.A.shape == (0, 0):
# No dynamics; use the unit time interval
T = np.linspace(0, 1, 100, endpoint=False)
else:
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))))

if sys.A.shape == (0, 0):
# No dynamics; use 100 time steps
T = range(100)
else:
tvec = _default_response_times(sys.A, 100)
T = range(int(np.ceil(max(tvec))))
U = np.ones_like(T)

T, yout, xout = forced_response(sys, T, U, X0, transpose=transpose,
Expand Down Expand Up @@ -574,11 +581,21 @@ def step_info(sys, T=None, SettlingTimeThreshold=0.02,
sys = _get_ss_simo(sys)
if T is None:
if isctime(sys):
T = _default_response_times(sys.A, 1000)
if sys.A.shape == (0, 0):
# No dynamics; use the unit time interval
T = np.linspace(0, 1, 100, endpoint=False)
else:
# Use 1000 time points for accuracy
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))))
if sys.A.shape == (0, 0):
# No dynamics; use 100 time steps
T = range(100)
else:
# Use 1000 time points for accuracy
tvec = _default_response_times(sys.A, 1000)
T = range(int(np.ceil(max(tvec))))

T, yout = step_response(sys, T)

Expand Down Expand Up @@ -698,11 +715,19 @@ def initial_response(sys, T=None, X0=0., input=0, output=None,
# The initial vector X0 is created in forced_response(...) if necessary
if T is None:
if isctime(sys):
T = _default_response_times(sys.A, 1000)
if sys.A.shape == (0, 0):
# No dynamics; use the unit time interval
T = np.linspace(0, 1, 100, endpoint=False)
else:
T = _default_response_times(sys.A, 100)
else:
# For discrete time, use integers
tvec = _default_response_times(sys.A, 1000)
T = range(int(np.ceil(max(tvec))))
if sys.A.shape == (0, 0):
# No dynamics; use 100 time steps
T = range(100)
else:
tvec = _default_response_times(sys.A, 100)

@bnavigator bnavigator Mar 23, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

length reduced from 1000 to 100

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 @@ -802,12 +827,19 @@ 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:
if isctime(sys):
T = _default_response_times(sys.A, 100)
if sys.A.shape == (0, 0):
# No dynamics; use the unit time interval
T = np.linspace(0, 1, 100, endpoint=False)
else:
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))))

if sys.A.shape == (0, 0):
# No dynamics; use 100 time steps
T = range(100)
else:
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