Skip to content

Commit fa8fbdd

Browse files
committed
Merge branch 'master' of github.com:florisvb/PyNumDiff into kalman-docstrings-and-doublecheck
2 parents 697d8d4 + 14751af commit fa8fbdd

8 files changed

Lines changed: 306 additions & 354 deletions

File tree

.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
root = true
2+
3+
[*.py]
4+
indent_style = tab
5+
indent_size = 4
6+
trim_trailing_whitespace = true

pynumdiff/__init__.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
"""
2-
Import useful functions from all modules
1+
"""Import useful functions from all modules
32
"""
43
from pynumdiff._version import __version__
54
from pynumdiff.finite_difference import first_order, second_order
6-
from pynumdiff.smooth_finite_difference import mediandiff, meandiff, gaussiandiff, \
5+
from pynumdiff.smooth_finite_difference import mediandiff, meandiff, gaussiandiff,\
76
friedrichsdiff, butterdiff, splinediff
8-
from pynumdiff.total_variation_regularization import *
9-
from pynumdiff.linear_model import *
10-
from pynumdiff.kalman_smooth import constant_velocity, constant_acceleration, constant_jerk, \
7+
from pynumdiff.total_variation_regularization import iterative_velocity, velocity,\
8+
acceleration, jerk, smooth_acceleration, jerk_sliding
9+
from pynumdiff.linear_model import lineardiff, polydiff, spectraldiff, savgoldiff
10+
from pynumdiff.kalman_smooth import constant_velocity, constant_acceleration, constant_jerk,\
1111
known_dynamics
12-

pynumdiff/finite_difference/_finite_difference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def first_order(x, dt, params=None, options={}, num_iterations=None):
1818
- **dxdt_hat** -- estimated derivative of x
1919
"""
2020
if params != None and 'iterate' in options:
21-
warn("""`params` and `options` parameters will be removed in a future version. Use `num_iterations` instead.""")
21+
warn("""`params` and `options` parameters will be removed in a future version. Use `num_iterations` instead.""", DeprecationWarning)
2222
if isinstance(params, list): params = params[0]
2323
return _iterate_first_order(x, dt, params)
2424
elif num_iterations:

0 commit comments

Comments
 (0)