Skip to content

Commit 4cd368f

Browse files
authored
Merge pull request #115 from florisvb/rationalize-linear
attempted to collapse function layers in linear module, put sliding f…
2 parents 27b6c86 + c7af959 commit 4cd368f

File tree

8 files changed

+263
-316
lines changed

8 files changed

+263
-316
lines changed

pynumdiff/kalman_smooth/_kalman_smooth.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ def constant_velocity(x, dt, params=None, options=None, r=None, q=None, forwardb
123123
- **dxdt_hat** -- estimated derivative of x
124124
"""
125125
if params != None: # boilerplate backwards compatibility code
126-
warn("""`params` and `options` parameters will be removed in a future version. Use `r`,
127-
`q`, and `forwardbackward` instead.""", DeprecationWarning)
126+
warn("`params` and `options` parameters will be removed in a future version. Use `r`, " +
127+
"`q`, and `forwardbackward` instead.", DeprecationWarning)
128128
r, q = params
129129
if options != None:
130130
if 'forwardbackward' in options: forwardbackward = options['forwardbackward']
@@ -158,8 +158,8 @@ def constant_acceleration(x, dt, params=None, options=None, r=None, q=None, forw
158158
- **dxdt_hat** -- estimated derivative of x
159159
"""
160160
if params != None: # boilerplate backwards compatibility code
161-
warn("""`params` and `options` parameters will be removed in a future version. Use `r`,
162-
`q`, and `forwardbackward` instead.""", DeprecationWarning)
161+
warn("`params` and `options` parameters will be removed in a future version. Use `r`, " +
162+
"`q`, and `forwardbackward` instead.", DeprecationWarning)
163163
r, q = params
164164
if options != None:
165165
if 'forwardbackward' in options: forwardbackward = options['forwardbackward']
@@ -197,8 +197,8 @@ def constant_jerk(x, dt, params=None, options=None, r=None, q=None, forwardbackw
197197
- **dxdt_hat** -- estimated derivative of x
198198
"""
199199
if params != None: # boilerplate backwards compatibility code
200-
warn("""`params` and `options` parameters will be removed in a future version. Use `r`,
201-
`q`, and `forwardbackward` instead.""", DeprecationWarning)
200+
warn("`params` and `options` parameters will be removed in a future version. Use `r`, " +
201+
"`q`, and `forwardbackward` instead.", DeprecationWarning)
202202
r, q = params
203203
if options != None:
204204
if 'forwardbackward' in options: forwardbackward = options['forwardbackward']
@@ -242,8 +242,8 @@ def known_dynamics(x, params, u=None, options=None, xhat0=None, P0=None, A=None,
242242
:return: np.array **x_hat** -- estimated (smoothed) x
243243
""" # Why not also returning derivative here?
244244
if params != None:
245-
warn("""`params` and `options` parameters will be removed in a future version. Use `xhat0`,
246-
`P0`, `A`, `B`, `C`, `Q`, `R`, and `smooth` instead.""", DeprecationWarning)
245+
warn("`params` and `options` parameters will be removed in a future version. Use `xhat0`, " +
246+
"`P0`, `A`, `B`, `C`, `Q`, `R`, and `smooth` instead.", DeprecationWarning)
247247
xhat0, P0, A, B, C, R, Q = params
248248
if options != None:
249249
if 'smooth' in options: smooth = options['smooth']

0 commit comments

Comments
 (0)