Skip to content

Commit d605807

Browse files
committed
update sphinxdocs and docstrings to fix missing function refs
1 parent dd078ae commit d605807

6 files changed

Lines changed: 25 additions & 6 deletions

File tree

control/optimal.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1953,13 +1953,18 @@ def __init__(
19531953
self.outputs = response.outputs
19541954

19551955

1956-
# Compute the moving horizon estimate for a nonlinear system
1956+
# Compute the finite horizon estimate for a nonlinear system
19571957
def solve_oep(
19581958
sys, timepts, Y, U, trajectory_cost, X0=None,
19591959
trajectory_constraints=None, initial_guess=None,
19601960
squeeze=None, print_summary=True, **kwargs):
19611961

1962-
"""Compute the solution to a moving horizon estimation problem.
1962+
"""Compute the solution to a finite horizon estimation problem.
1963+
1964+
This function computes the maximum likelihood estimate of a system
1965+
state given the input and output over a fixed horizon. The likelihood
1966+
is evaluated according to a cost function whose value is minimized
1967+
to compute the maximum likelhood estimate.
19631968
19641969
Parameters
19651970
----------

control/statesp.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1929,6 +1929,9 @@ def ssdata(sys):
19291929
def linfnorm(sys, tol=1e-10):
19301930
"""L-infinity norm of a linear system.
19311931
1932+
.. deprecated:: 0.10.2
1933+
This functionality is now available in :func:`sysnorm`.
1934+
19321935
Parameters
19331936
----------
19341937
sys : LTI (StateSpace or TransferFunction)
@@ -1952,6 +1955,7 @@ def linfnorm(sys, tol=1e-10):
19521955
--------
19531956
slycot.ab13dd : the Slycot routine linfnorm that does the calculation
19541957
"""
1958+
warn("linfnorm() is deprecated; use sysnorm(sys, p='inf')", FutureWarning)
19551959

19561960
if ab13dd is None:
19571961
raise ControlSlycot("Can't find slycot module 'ab13dd'")

control/tests/statesp_test.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
from control.config import defaults
2020
from control.dtime import sample_system
2121
from control.lti import evalfr
22-
from control.statesp import (StateSpace, _convert_to_statespace, _rss_generate,
23-
_statesp_defaults, drss, linfnorm, rss, ss, tf2ss)
24-
from control.tests.conftest import (assert_tf_close_coeff, editsdefaults,
25-
slycotonly)
22+
from control.statesp import StateSpace, _convert_to_statespace, tf2ss, \
23+
_statesp_defaults, _rss_generate, linfnorm, ss, rss, drss
2624
from control.xferfcn import TransferFunction, ss2tf
25+
from control.tests.conftest import assert_tf_close_coeff, editsdefaults, \
26+
slycotonly
2727

2828

2929
class TestStateSpace:
@@ -1515,13 +1515,15 @@ def dt_siso(self, request):
15151515
return ct.c2d(systype(*sysargs), dt), refgpeak, reffpeak
15161516

15171517
@slycotonly
1518+
@pytest.mark.usefixtures('ignore_future_warning')
15181519
def test_linfnorm_ct_siso(self, ct_siso):
15191520
sys, refgpeak, reffpeak = ct_siso
15201521
gpeak, fpeak = linfnorm(sys)
15211522
np.testing.assert_allclose(gpeak, refgpeak)
15221523
np.testing.assert_allclose(fpeak, reffpeak)
15231524

15241525
@slycotonly
1526+
@pytest.mark.usefixtures('ignore_future_warning')
15251527
def test_linfnorm_dt_siso(self, dt_siso):
15261528
sys, refgpeak, reffpeak = dt_siso
15271529
gpeak, fpeak = linfnorm(sys)
@@ -1530,6 +1532,7 @@ def test_linfnorm_dt_siso(self, dt_siso):
15301532
np.testing.assert_allclose(fpeak, reffpeak)
15311533

15321534
@slycotonly
1535+
@pytest.mark.usefixtures('ignore_future_warning')
15331536
def test_linfnorm_ct_mimo(self, ct_siso):
15341537
siso, refgpeak, reffpeak = ct_siso
15351538
sys = ct.append(siso, siso)

doc/control.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ System interconnections
3030
:toctree: generated/
3131

3232
append
33+
combine_tf
3334
connect
3435
feedback
3536
interconnect
3637
negate
3738
parallel
3839
series
40+
split_tf
3941
connection_table
4042
combine_tf
4143
split_tf
@@ -81,13 +83,15 @@ Control system analysis
8183
.. autosummary::
8284
:toctree: generated/
8385

86+
bandwidth
8487
dcgain
8588
describing_function
8689
frequency_response
8790
get_input_ff_index
8891
get_output_fb_index
8992
ispassive
9093
margin
94+
solve_passivity_LMI
9195
stability_margins
9296
step_info
9397
phase_crossover_frequencies

doc/optimal.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,5 +492,6 @@ The following classes and functions are defined in the
492492
~control.optimal.output_range_constraint
493493
~control.optimal.quadratic_cost
494494
~control.optimal.solve_ocp
495+
~control.optimal.solve_oep
495496
~control.optimal.state_poly_constraint
496497
~control.optimal.state_range_constraint

doc/plotting.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,9 @@ Plotting functions
673673
~control.nichols_plot
674674
~control.nyquist_plot
675675
~control.phase_plane_plot
676+
phaseplot.circlegrid
676677
phaseplot.equilpoints
678+
phaseplot.meshgrid
677679
phaseplot.separatrices
678680
phaseplot.streamlines
679681
phaseplot.vectorfield

0 commit comments

Comments
 (0)