Skip to content

Commit a6b30b1

Browse files
committed
update MATLAB function list
1 parent eedbf2b commit a6b30b1

3 files changed

Lines changed: 17 additions & 8 deletions

File tree

control/nichols.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ def _inner_extents(ax):
177177

178178
def nichols_grid(cl_mags=None, cl_phases=None, line_style='dotted', ax=None,
179179
label_cl_phases=True):
180-
"""Nichols chart grid.
180+
"""Plot Nichols chart grid.
181181
182-
Plots a Nichols chart grid on the current axis, or creates a new chart
182+
Plots a Nichols chart grid on the current axes, or creates a new chart
183183
if no plot already exists.
184184
185185
Parameters

doc/matlab.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Time-Domain Analysis
6767
impulse
6868
initial
6969
lsim
70+
stepinfo
7071

7172
Frequency-Domain Analysis
7273
=========================
@@ -75,8 +76,9 @@ Frequency-Domain Analysis
7576

7677
bode
7778
nyquist
78-
nichols
7979
margin
80+
nichols
81+
ngrid
8082
freqresp
8183
evalfr
8284

doc/test_sphinxdocs.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@
6262
standalone = False
6363

6464
control_module_list = [
65-
control, control.flatsys, control.optimal, control.phaseplot
66-
]
65+
control, control.flatsys, control.optimal, control.phaseplot]
6766
@pytest.mark.parametrize("module", control_module_list)
68-
def test_sphinx_functions(module):
67+
def test_sphinx_functions(module, check_legacy=True):
6968

7069
# Look through every object in the package
7170
_info(f"Checking module {module}", 1)
@@ -104,7 +103,8 @@ def test_sphinx_functions(module):
104103
case True, _, True, _:
105104
_warn(f"deprecated object" + referenced)
106105
case True, _, _, True:
107-
_warn(f"legacy object" + referenced)
106+
if check_legacy:
107+
_warn(f"legacy object" + referenced)
108108
case False, False, False, False:
109109
_fail(f"{objname} not referenced in sphinx docs")
110110

@@ -160,6 +160,12 @@ def test_config_defaults():
160160
_warn(f"Unknown params in config.rst: {config_rstdocs}")
161161

162162

163+
# Test MATLAB library separately (and after config_defaults)
164+
def test_sphinx_matlab():
165+
import control.matlab
166+
test_sphinx_functions(control.matlab, check_legacy=False)
167+
168+
163169
def _check_deprecated(obj):
164170
with warnings.catch_warnings():
165171
warnings.simplefilter('ignore') # debug via sphinx, not here
@@ -193,5 +199,6 @@ def _fail(str, level=-1):
193199

194200
for module in control_module_list:
195201
test_sphinx_functions(module)
196-
197202
test_config_defaults()
203+
test_sphinx_matlab()
204+

0 commit comments

Comments
 (0)