updated error bounds

Author: pavelkomarov

pynumdiff/polynomial_fit.py

@@ -87,6 +87,7 @@ def polydiff(x, dt_or_t, params=None, options=None, degree=None, window_size=Non
         if window_size % 2 == 0:
             window_size += 1
             warn("Kernel window size should be odd. Added 1 to length.")
+        kernel = {'gaussian':utility.gaussian_kernel, 'friedrichs':utility.friedrichs_kernel}[kernel](window_size)
 
     def _polydiff(x, dt_or_t, degree, weights=None):
         t = dt_or_t if not np.isscalar(dt_or_t) else np.arange(len(x)) * dt_or_t # sample locations
@@ -102,8 +103,6 @@ def _polydiff(x, dt_or_t, degree, weights=None):
         return x_hat, dxdt_hat
 
     x_hat = np.empty_like(x); dxdt_hat = np.empty_like(x)
-    if window_size: kernel = {'gaussian':utility.gaussian_kernel, 'friedrichs':utility.friedrichs_kernel}[kernel](window_size)
-    
     for vec_idx in np.ndindex(x.shape[:axis] + x.shape[axis+1:]):
         s = vec_idx[:axis] + (slice(None),) + vec_idx[axis:]
         x_hat[s], dxdt_hat[s] = _polydiff(x[s], dt_or_t, degree) if not window_size else \

pynumdiff/tests/test_diff_methods.py

@@ -328,7 +328,7 @@ def test_diff_method(diff_method_and_params, test_func_and_deriv, request): # re
     (polydiff, {'degree': 2, 'window_size': 5}),
     (savgoldiff, {'degree': 3, 'window_size': 11, 'smoothing_win': 3}),
     (rtsdiff, {'order':2, 'log_qr_ratio':7, 'forwardbackward':True}),
-    (robustdiff, {'order':2, 'log_q':7, 'log_r':2}),
+    (robustdiff, {'order':2, 'log_q':7, 'log_r':2})
 ]
 
 # Similar to the error_bounds table, index by method first. But then we test against only one 2D function,
@@ -339,7 +339,7 @@ def test_diff_method(diff_method_and_params, test_func_and_deriv, request): # re
     kerneldiff: [(2, 1), (3, 2)],
     butterdiff: [(0, -1), (1, -1)],
     finitediff: [(0, -1), (1, -1)],
-    polydiff: [(2, 2), (3, 3)],
+    polydiff: [(1, -1), (1, 0)],
     savgoldiff: [(0, -1), (1, 1)],
     rtsdiff: [(1, -1), (1, 0)],
     robustdiff: [(-2, -3), (0, -1)]