diff --git a/control/tests/timeplot_test.py b/control/tests/timeplot_test.py
index 0fcc159be..58ef062a5 100644
--- a/control/tests/timeplot_test.py
+++ b/control/tests/timeplot_test.py
@@ -258,7 +258,7 @@ def test_combine_time_responses():
sys_mimo = ct.rss(4, 2, 2)
timepts = np.linspace(0, 10, 100)
- # Combine two response with ntrace = 0
+ # Combine two responses with ntrace = 0
U = np.vstack([np.sin(timepts), np.cos(2*timepts)])
resp1 = ct.input_output_response(sys_mimo, timepts, U)
@@ -293,6 +293,7 @@ def test_combine_time_responses():
combresp4 = ct.combine_time_responses(
[resp1, resp2, resp3], trace_labels=labels)
assert combresp4.trace_labels == labels
+ assert combresp4.trace_types == [None, None, 'step', 'step']
# Automatically generated trace label names and types
resp5 = ct.step_response(sys_mimo, timepts)
@@ -302,7 +303,13 @@ def test_combine_time_responses():
combresp5 = ct.combine_time_responses([resp1, resp5])
assert combresp5.trace_labels == [resp1.title] + \
["test, trace 0", "test, trace 1"]
- assert combresp4.trace_types == [None, None, 'step', 'step']
+ assert combresp5.trace_types == [None, None, None]
+
+ # ntraces = 0 with trace_types != None
+ # https://github.com/python-control/python-control/issues/1025
+ resp6 = ct.forced_response(sys_mimo, timepts, U)
+ combresp6 = ct.combine_time_responses([resp1, resp6])
+ assert combresp6.trace_types == [None, 'forced']
with pytest.raises(ValueError, match="must have the same number"):
resp = ct.step_response(ct.rss(4, 2, 3), timepts)
diff --git a/control/timeplot.py b/control/timeplot.py
index 2eb7aec9b..f257d2b3a 100644
--- a/control/timeplot.py
+++ b/control/timeplot.py
@@ -738,7 +738,8 @@ def combine_time_responses(response_list, trace_labels=None, title=None):
if generate_trace_labels:
trace_labels.append(response.title)
trace_types.append(
- None if response.trace_types is None else response.types[0])
+ None if response.trace_types is None
+ else response.trace_types[0])
else:
# Save the data
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy