python-control · murrayrm · Jul 13, 2023 · Jun 21, 2023 · Jun 25, 2023 · Jun 28, 2023
diff --git a/control/__init__.py b/control/__init__.py
@@ -77,6 +77,10 @@
 from .xferfcn import *
 from .frdata import *
 
+# Time responses and plotting
+from .timeresp import *
+from .timeplot import *
+
 from .bdalg import *
 from .delay import *
 from .descfcn import *
@@ -91,7 +95,6 @@
 from .rlocus import *
 from .statefbk import *
 from .stochsys import *
-from .timeresp import *
 from .ctrlutil import *
 from .canonical import *
 from .robust import *

diff --git a/control/config.py b/control/config.py
@@ -135,6 +135,9 @@ def reset_defaults():
     from .optimal import _optimal_defaults
     defaults.update(_optimal_defaults)
 
+    from .timeplot import _timeplot_defaults
+    defaults.update(_timeplot_defaults)
+
 
 def _get_param(module, param, argval=None, defval=None, pop=False, last=False):
     """Return the default value for a configuration option.

diff --git a/control/nlsys.py b/control/nlsys.py
@@ -1488,6 +1488,7 @@ def ufun(t):
         return TimeResponseData(
             t_eval, y, None, u, issiso=sys.issiso(),
             output_labels=sys.output_labels, input_labels=sys.input_labels,
+            title="Input/output response for " + sys.name, sysname=sys.name,
             transpose=transpose, return_x=return_x, squeeze=squeeze)
 
     # Create a lambda function for the right hand side
@@ -1567,7 +1568,8 @@ def ivp_rhs(t, x):
     return TimeResponseData(
         soln.t, y, soln.y, u, issiso=sys.issiso(),
         output_labels=sys.output_labels, input_labels=sys.input_labels,
-        state_labels=sys.state_labels,
+        state_labels=sys.state_labels, sysname=sys.name,
+        title="Input/output response for " + sys.name,
         transpose=transpose, return_x=return_x, squeeze=squeeze)
 
 

diff --git a/control/tests/kwargs_test.py b/control/tests/kwargs_test.py
@@ -26,6 +26,7 @@
 import control.tests.statefbk_test as statefbk_test
 import control.tests.stochsys_test as stochsys_test
 import control.tests.trdata_test as trdata_test
+import control.tests.timeplot_test as timeplot_test
 
 @pytest.mark.parametrize("module, prefix", [
     (control, ""), (control.flatsys, "flatsys."), (control.optimal, "optimal.")
@@ -74,7 +75,8 @@ def test_kwarg_search(module, prefix):
                 # @parametrize messes up the check, but we know it is there
                 pass
 
-            elif source and source.find('unrecognized keyword') < 0:
+            elif source and source.find('unrecognized keyword') < 0 and \
+                 source.find('unexpected keyword') < 0:
                 warnings.warn(
                     f"'unrecognized keyword' not found in unit test "
                     f"for {name}")
@@ -161,7 +163,21 @@ def test_matplotlib_kwargs(function, nsysargs, moreargs, kwargs, mplcleanup):
         function(*args, **kwargs, unknown=None)
 
 
+@pytest.mark.parametrize(
+    "function", [control.time_response_plot, control.TimeResponseData.plot])
+def test_time_response_plot_kwargs(function):
+    # Create a system for testing
+    response = control.step_response(control.rss(4, 2, 2))
+
+    # Call the plotting function normally and make sure it works
+    function(response)
 
+    # Now add an unrecognized keyword and make sure there is an error
+    with pytest.raises(AttributeError,
+                       match="(has no property|unexpected keyword)"):
+        function(response, unknown=None)
+
+
 #
 # List of all unit tests that check for unrecognized keywords
 #
@@ -185,6 +201,7 @@ def test_matplotlib_kwargs(function, nsysargs, moreargs, kwargs, mplcleanup):
     'gangof4_plot': test_matplotlib_kwargs,
     'input_output_response': test_unrecognized_kwargs,
     'interconnect': interconnect_test.test_interconnect_exceptions,
+    'time_response_plot': timeplot_test.test_errors,
     'linearize': test_unrecognized_kwargs,
     'lqe': test_unrecognized_kwargs,
     'lqr': test_unrecognized_kwargs,
@@ -230,6 +247,7 @@ def test_matplotlib_kwargs(function, nsysargs, moreargs, kwargs, mplcleanup):
     'StateSpace.__init__': test_unrecognized_kwargs,
     'StateSpace.sample': test_unrecognized_kwargs,
     'TimeResponseData.__call__': trdata_test.test_response_copy,
+    'TimeResponseData.plot': timeplot_test.test_errors,
     'TransferFunction.__init__': test_unrecognized_kwargs,
     'TransferFunction.sample': test_unrecognized_kwargs,
     'optimal.OptimalControlProblem.__init__':