Skip to content

Commit 2822a40

Browse files
committed
various changes to .readthedocs.yaml, .rsts, etc, trying to get the documentation build to pass and look nice
1 parent f14af42 commit 2822a40

8 files changed

Lines changed: 35 additions & 64 deletions

File tree

.readthedocs.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
11
version: 2
22

3+
sphinx:
4+
configuration: docs/source/conf.py
5+
36
build:
47
os: ubuntu-22.04
5-
docs_dir: docs
6-
builder: html # Use the 'sphinx' builder (default for 'make html')
8+
tools:
9+
python: "3.11"
710

11+
python:
12+
install:
13+
- method: pip
14+
path: .
15+
extra_requirements:
16+
- docs

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ Python methods for numerical differentiation of noisy data, including multi-obje
99
</p>
1010

1111
<p align="center">
12-
<a href='https://pynumdiff.readthedocs.io/en/master/?badge=master'>
13-
<img src='https://readthedocs.org/projects/pynumdiff/badge/?version=master' alt='Documentation Status' /></a>
12+
<a href='https://pynumdiff.readthedocs.io/master/'>
13+
<img src='https://app.readthedocs.org/projects/pynumdiff/badge/?version=master' alt='Documentation Status' /></a>
1414
<a href="https://badge.fury.io/py/pynumdiff">
1515
<img src="https://badge.fury.io/py/pynumdiff.svg" alt="PyPI version" height="18"></a>
1616
<a href="https://zenodo.org/badge/latestdoi/159711175">

docs/make.bat

Lines changed: 0 additions & 35 deletions
This file was deleted.

docs/source/utils.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ utils
44
.. toctree::
55
:maxdepth: 1
66

7-
utils/_pi_cruise_control
87
utils/evaluate
98
utils/simulate
109
utils/utility

docs/source/utils/_pi_cruise_control.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

pynumdiff/kalman_smooth/_kalman_smooth.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ def constant_velocity(x, dt, params=None, options=None, r=None, q=None, forwardb
113113
:param list[float] params: (**deprecated**, prefer :code:`r` and :code:`q`)
114114
:param options: (**deprecated**, prefer :code:`forwardbackward`)
115115
a dictionary consisting of {'forwardbackward': (bool)}
116-
param float r: variance of the signal noise
117-
param float q: variance of the constant velocity model
116+
:param float r: variance of the signal noise
117+
:param float q: variance of the constant velocity model
118118
:param bool forwardbackward: indicates whether to run smoother forwards and backwards
119119
(usually achieves better estimate at end points)
120120
@@ -148,8 +148,8 @@ def constant_acceleration(x, dt, params=None, options=None, r=None, q=None, forw
148148
:param list[float] params: (**deprecated**, prefer :code:`r` and :code:`q`)
149149
:param options: (**deprecated**, prefer :code:`forwardbackward`)
150150
a dictionary consisting of {'forwardbackward': (bool)}
151-
param float r: variance of the signal noise
152-
param float q: variance of the constant acceleration model
151+
:param float r: variance of the signal noise
152+
:param float q: variance of the constant acceleration model
153153
:param bool forwardbackward: indicates whether to run smoother forwards and backwards
154154
(usually achieves better estimate at end points)
155155
@@ -187,8 +187,8 @@ def constant_jerk(x, dt, params=None, options=None, r=None, q=None, forwardbackw
187187
:param list[float] params: (**deprecated**, prefer :code:`r` and :code:`q`)
188188
:param options: (**deprecated**, prefer :code:`forwardbackward`)
189189
a dictionary consisting of {'forwardbackward': (bool)}
190-
param float r: variance of the signal noise
191-
param float q: variance of the constant jerk model
190+
:param float r: variance of the signal noise
191+
:param float q: variance of the constant jerk model
192192
:param bool forwardbackward: indicates whether to run smoother forwards and backwards
193193
(usually achieves better estimate at end points)
194194
@@ -237,7 +237,7 @@ def known_dynamics(x, params, u=None, options=None, xhat0=None, P0=None, A=None,
237237
:param np.array C: measurement dynamics, MxN
238238
:param np.array Q: covariance matrix for the model, NxN
239239
:param np.array R: covariance matrix for the measurements, MxM
240-
:parma bool smooth: whether to run the RTS smoother step
240+
:param bool smooth: whether to run the RTS smoother step
241241
242242
:return: np.array **x_hat** -- estimated (smoothed) x
243243
""" # Why not also returning derivative here?

pynumdiff/utils/utility.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ def hankel_matrix(x, num_delays, pad=False): # fixed delay step of 1
88
:param np.array[float] x: data
99
:param int num_delays: number of times to 1-step shift data
1010
:param bool pad: if True, return width is len(x), else width is len(x) - num_delays + 1
11-
:return: a Hankel Matrix m
12-
e.g. if x = [a, b, c, d, e] and num_delays = 3
13-
then with pad = False:
14-
m = [['a', 'b', 'c'],
15-
['b', 'c', 'd'],
16-
['c', 'd', 'e']]
17-
or pad = True:
18-
m = [['a', 'b', 'c', 'd', 'e'],
19-
['b', 'c', 'd', 'e', 0],
20-
['c', 'd', 'e', 0, 0]]
11+
12+
:return: a Hankel Matrix `m`. For example, if `x = [a, b, c, d, e]` and `num_delays = 3`:\n
13+
With `pad = False`::\n
14+
m = [[a, b, c],
15+
[b, c, d],
16+
[c, d, e]]\n
17+
With `pad = True`::\n
18+
m = [[a, b, c, d, e],
19+
[b, c, d, e, 0],
20+
[c, d, e, 0, 0]]
2121
"""
2222
m = x.copy()
2323
for d in range(1, num_delays):

pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ dev = [
4646
"cvxpy",
4747
"Mosek"
4848
]
49+
docs = [
50+
"sphinx",
51+
"sphinx_rtd_theme",
52+
"cvxpy"
53+
]
4954

5055
[tool.setuptools_scm]
5156
write_to = "pynumdiff/_version.py"

0 commit comments

Comments
 (0)