From 8644bd2b0bced1c94a17acb7f8a270ca65447625 Mon Sep 17 00:00:00 2001 From: huxiaoyi-ovo Date: Tue, 27 Oct 2026 05:16:09 -0400 Subject: [PATCH 1/2] fix(freqplot): accept precomputed gang-of-four responses --- control/freqplot.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/control/freqplot.py b/control/freqplot.py index 35a5ee503..8ded49442 100644 --- a/control/freqplot.py +++ b/control/freqplot.py @@ -2311,12 +2311,11 @@ def gangof4_plot( """ if len(args) == 1 and isinstance(args[0], FrequencyResponseData): - if any([kw is not None - for kw in [omega, omega_limits, omega_num, Hz]]): + if any(kw is not None for kw in [omega, omega_limits, omega_num]) or Hz: raise ValueError( "omega, omega_limits, omega_num, Hz not allowed when " "given a Gang of 4 response as first argument") - return args[0].plot(kwargs) + return args[0].plot(**kwargs) else: if len(args) > 3: raise TypeError( From 53198225c0efffe0ac8bbd954cb5b6bef5d3fd87 Mon Sep 17 00:00:00 2001 From: huxiaoyi-ovo Date: Tue, 27 Oct 2026 05:16:37 -0400 Subject: [PATCH 2/2] test(freqplot): cover precomputed gang-of-four plots and options --- control/tests/freqplot_test.py | 43 ++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/control/tests/freqplot_test.py b/control/tests/freqplot_test.py index b3770486c..ebfe963a1 100644 --- a/control/tests/freqplot_test.py +++ b/control/tests/freqplot_test.py @@ -258,6 +258,49 @@ def test_gangof4_plots(savefigs=False): plt.savefig('freqplot-gangof4.png') + +@pytest.mark.usefixtures("mplcleanup") +def test_gangof4_plot_precomputed_response(): + """A precomputed response must use the same 2x2 plot API as P/C input.""" + P = ct.tf([1], [1, 1], name="P") + C = ct.tf([2], [1], name="C") + response = ct.gangof4_response(P, C, omega=np.logspace(-2, 2, 16)) + + cplt = ct.gangof4_plot(response, dB=True) + + assert cplt.axes.shape == (2, 2) + assert all(len(lines) > 0 for lines in cplt.lines.flat) + + +def test_gangof4_plot_precomputed_passes_kwargs(monkeypatch): + """Plot options must be forwarded as keywords, not a positional dict.""" + response = ct.gangof4_response(ct.tf([1], [1, 1]), ct.tf([2], [1])) + seen = {} + sentinel = object() + + def check_plot(*args, **kwargs): + assert not args + seen.update(kwargs) + return sentinel + + monkeypatch.setattr(response, "plot", check_plot) + assert ct.gangof4_plot(response, dB=True, label="closed loop", Hz=False) is sentinel + assert seen == {"dB": True, "label": "closed loop"} + + +@pytest.mark.parametrize("frequency_kwargs", [ + {"omega": np.array([1.0, 2.0])}, + {"omega_limits": [0.1, 10]}, + {"omega_num": 100}, + {"Hz": True}, +]) +def test_gangof4_plot_precomputed_rejects_frequency_kwargs(frequency_kwargs): + """A response with fixed frequencies cannot select them again.""" + response = ct.gangof4_response(ct.tf([1], [1, 1]), ct.tf([2], [1])) + with pytest.raises(ValueError, match="not allowed"): + ct.gangof4_plot(response, **frequency_kwargs) + + @pytest.mark.parametrize("response_cmd, return_type", [ (ct.frequency_response, ct.FrequencyResponseData), (ct.nyquist_response, ct.freqplot.NyquistResponseData),