Skip to content

Time response plot improvements #1018

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 12 commits into from
Jul 7, 2024
Merged

Time response plot improvements #1018

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
95326b0
initial pass at defining lists of systems for time responses
murrayrm Jun 4, 2024
3732217
use _process_ax_keyword in time_response_plot
murrayrm Jun 16, 2024
44123c9
refactoring to put common functions in ctrlplot.py
murrayrm Jun 16, 2024
8b416eb
Add list of systems functionality to time response functions
murrayrm Jun 18, 2024
6be8f48
allow combining I/O time responses with different numbers of states
murrayrm Jun 20, 2024
8b269bf
add plot_gallery to compare plotting results between builds
murrayrm Jun 20, 2024
cc6aeb6
improved unit tests for rcParams + small fix to suptitle rcParams
murrayrm Jun 20, 2024
ed8a1c1
allow label keyword to override generated labels
murrayrm Jun 25, 2024
92d36cc
cleanup after plotting in test functions
murrayrm Jun 26, 2024
8f0c227
add CDS 110 example notebook demonstrating features
murrayrm Jun 26, 2024
d459569
add show_legend processing
murrayrm Jun 29, 2024
10f009b
address @slivingston review comments
murrayrm Jul 7, 2024
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
Next Next commit
cleanup after plotting in test functions
  • Loading branch information
@murrayrm
murrayrm committed Jun 29, 2024
commit 92d36cc80c9796ddd79dd9b9cbf9091b8ffed2ac
13 changes: 11 additions & 2 deletions control/tests/timeplot_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import matplotlib.pyplot as plt
import numpy as np

from control.tests.conftest import slycotonly
from control.tests.conftest import slycotonly, mplcleanup

# Detailed test of (almost) all functionality
#
Expand Down Expand Up @@ -67,6 +67,7 @@
True, True, False, False, False, False),
])

@pytest.mark.usefixtures('mplcleanup')
def test_response_plots(
fcn, sys, pltinp, pltout, cmbsig, cmbtrc,
trpose, secsys, clear=True):
Expand Down Expand Up @@ -190,6 +191,7 @@ def test_response_plots(
plt.clf()


@pytest.mark.usefixtures('mplcleanup')
def test_axes_setup():
get_plot_axes = ct.get_plot_axes

Expand Down Expand Up @@ -238,6 +240,7 @@ def test_axes_setup():


@slycotonly
@pytest.mark.usefixtures('mplcleanup')
def test_legend_map():
sys_mimo = ct.tf2ss(
[[[1], [0.1]], [[0.2], [1]]],
Expand All @@ -250,6 +253,7 @@ def test_legend_map():
title='MIMO step response with custom legend placement')


@pytest.mark.usefixtures('mplcleanup')
def test_combine_time_responses():
sys_mimo = ct.rss(4, 2, 2)
timepts = np.linspace(0, 10, 100)
Expand Down Expand Up @@ -316,6 +320,7 @@ def test_combine_time_responses():
@pytest.mark.parametrize("resp_fcn", [
ct.step_response, ct.initial_response, ct.impulse_response,
ct.forced_response, ct.input_output_response])
@pytest.mark.usefixtures('mplcleanup')
def test_list_responses(resp_fcn):
sys1 = ct.rss(2, 2, 2, strictly_proper=True)
sys2 = ct.rss(2, 2, 2, strictly_proper=True)
Expand Down Expand Up @@ -362,6 +367,7 @@ def test_list_responses(resp_fcn):


@slycotonly
@pytest.mark.usefixtures('mplcleanup')
def test_linestyles():
# Check to make sure we can change line styles
sys_mimo = ct.tf2ss(
Expand Down Expand Up @@ -391,6 +397,7 @@ def test_linestyles():
assert lines[7].get_color() == 'green' and lines[7].get_linestyle() == '--'


@pytest.mark.usefixtures('mplcleanup')
def test_rcParams():
sys = ct.rss(2, 2, 2)

Expand Down Expand Up @@ -428,7 +435,7 @@ def test_rcParams():
@pytest.mark.parametrize("resp_fcn", [
ct.step_response, ct.initial_response, ct.impulse_response,
ct.forced_response, ct.input_output_response])
@pytest.mark.usefixtures("editsdefaults")
@pytest.mark.usefixtures('editsdefaults', 'mplcleanup')
def test_timeplot_trace_labels(resp_fcn):
plt.close('all')
sys1 = ct.rss(2, 2, 2, strictly_proper=True, name='sys1')
Expand Down Expand Up @@ -486,6 +493,7 @@ def test_timeplot_trace_labels(resp_fcn):
plt.close()


@pytest.mark.usefixtures('mplcleanup')
def test_full_label_override():
sys1 = ct.rss(2, 2, 2, strictly_proper=True, name='sys1')
sys2 = ct.rss(2, 2, 2, strictly_proper=True, name='sys2')
Expand Down Expand Up @@ -531,6 +539,7 @@ def test_full_label_override():
assert legend_text[i].get_text() == label


@pytest.mark.usefixtures('mplcleanup')
def test_relabel():
sys1 = ct.rss(2, inputs='u', outputs='y')
sys2 = ct.rss(1, 1, 1) # uses default i/o labels
Expand Down