updated to get tests to pass

Author: pavelkomarov

pynumdiff/smooth_finite_difference/_smooth_finite_difference.py

@@ -3,7 +3,7 @@
 from warnings import warn
 
 # included code
-from pynumdiff.finite_difference import first_order as finite_difference
+from pynumdiff.finite_difference import second_order as finite_difference
 from pynumdiff.utils import utility
 
 

pynumdiff/tests/test_diff_methods.py

@@ -34,7 +34,7 @@ def iterated_first_order(*args, **kwargs): return first_order(*args, **kwargs)
     (iterated_first_order, {'num_iterations':5}), (iterated_first_order, [5], {'iterate':True}),
     (second_order, {}),
     (fourth_order, {}),
-    (lineardiff, {'order':3, 'gamma':5, 'window_size':11, 'solver':'CLARABEL'}), (lineardiff, [3, 5, 11], {'solver':'CLARABEL'}),
+    (lineardiff, {'order':3, 'gamma':5, 'window_size':21, 'solver':'CLARABEL'}), (lineardiff, [3, 5, 21], {'solver':'CLARABEL'}),
     (polydiff, {'polynomial_order':2, 'window_size':3}), (polydiff, [2, 3]),
     (savgoldiff, {'polynomial_order':2, 'window_size':4, 'smoothing_win':4}), (savgoldiff, [2, 4, 4]),
     (spectraldiff, {'high_freq_cutoff':0.1}), (spectraldiff, [0.1]),
@@ -55,6 +55,7 @@ def iterated_first_order(*args, **kwargs): return first_order(*args, **kwargs)
     (smooth_acceleration, {'gamma':2, 'window_size':5}), (smooth_acceleration, [2, 5]),
     (jerk_sliding, {'gamma':1, 'window_size':15}), (jerk_sliding, [1], {'window_size':15})
     ]
+#diff_methods_and_params = [(gaussiandiff, {'window_size':5})]
 
 # All the testing methodology follows the exact same pattern; the only thing that changes is the
 # closeness to the right answer various methods achieve with the given parameterizations. So index a
@@ -66,7 +67,7 @@ def iterated_first_order(*args, **kwargs): return first_order(*args, **kwargs)
                   [(-25, -25), (1, 0), (0, 0), (1, 1)],
                   [(-25, -25), (2, 2), (0, 0), (2, 2)],
                   [(-25, -25), (3, 3), (0, 0), (3, 3)]],
-    iterated_first_order: [[(-8, -9), (-25, -25), (0, 0), (1, 1)],
+    iterated_first_order: [[(-8, -9), (-9, -9), (0, 0), (1, 1)],
                            [(-6, -6), (-6, -7), (0, 0), (1, 1)],
                            [(1, 0), (1, 0), (1, 1), (1, 1)],
                            [(1, 0), (1, 1), (1, 0), (1, 1)],
@@ -84,11 +85,11 @@ def iterated_first_order(*args, **kwargs): return first_order(*args, **kwargs)
                    [(-25, -25), (-2, -2), (0, 0), (1, 1)],
                    [(-25, -25), (1, 0), (0, 0), (1, 1)],
                    [(-25, -25), (2, 2), (0, 0), (2, 2)]],
-    lineardiff: [[(-6, -6), (-5, -6), (0, -1), (0, 0)],
-                 [(0, 0), (1, 1), (0, 0), (1, 1)],
-                 [(1, 0), (2, 2), (1, 0), (2, 2)],
+    lineardiff: [[(-6, -7), (-6, -6), (-1, -1), (0, 0)],
                  [(1, 0), (2, 1), (1, 0), (2, 1)],
                  [(1, 1), (2, 2), (1, 1), (2, 2)],
+                 [(0, 0), (1, 1), (0, 0), (1, 1)],
+                 [(1, 1), (2, 2), (1, 1), (2, 2)],
                  [(1, 1), (3, 3), (1, 1), (3, 3)]],
     polydiff: [[(-14, -15), (-14, -14), (0, -1), (1, 1)],
                [(-14, -14), (-13, -13), (0, -1), (1, 1)],
@@ -115,19 +116,19 @@ def iterated_first_order(*args, **kwargs): return first_order(*args, **kwargs)
                  [(0, 0), (2, 2), (0, 0), (2, 2)],
                  [(1, 1), (3, 3), (1, 1), (3, 3)]],
     meandiff: [[(-25, -25), (-25, -25), (0, -1), (0, 0)],
-               [(0, 0), (1, 0), (0, 0), (1, 1)],
+               [(0, 0), (1, 1), (0, 0), (1, 1)],
                [(0, 0), (1, 1), (0, 0), (1, 1)],
                [(0, 0), (1, 1), (0, 0), (1, 1)],
                [(1, 1), (2, 2), (1, 1), (2, 2)],
                [(1, 1), (3, 3), (1, 1), (3, 3)]],
     gaussiandiff: [[(-14, -15), (-14, -14), (0, -1), (1, 0)],
-                   [(-1, -1), (0, 0), (0, 0), (1, 0)],
+                   [(-1, -1), (1, 0), (0, 0), (1, 1)],
                    [(0, 0), (1, 1), (0, 0), (1, 1)],
-                   [(0, -1), (1, 0), (0, 0), (1, 1)],
+                   [(0, -1), (1, 1), (0, 0), (1, 1)],
                    [(1, 1), (2, 2), (1, 1), (2, 2)],
                    [(1, 1), (3, 3), (1, 1), (3, 3)]],
-    friedrichsdiff: [[(-25, -25), (-25, -25), (0, -1), (0, 0)],
-                     [(-1, -1), (0, 0), (0, 0), (1, 0)],
+    friedrichsdiff: [[(-25, -25), (-25, -25), (0, -1), (1, 0)],
+                     [(-1, -1), (1, 0), (0, 0), (1, 1)],
                      [(0, 0), (1, 1), (0, 0), (1, 1)],
                      [(0, -1), (1, 1), (0, 0), (1, 1)],
                      [(1, 1), (2, 2), (1, 1), (2, 2)],
@@ -140,7 +141,7 @@ def iterated_first_order(*args, **kwargs): return first_order(*args, **kwargs)
                  [(2, 1), (3, 3), (2, 1), (3, 3)]],
     splinediff: [[(-14, -15), (-14, -14), (-1, -1), (0, 0)],
                  [(-14, -14), (-13, -14), (-1, -1), (0, 0)],
-                 [(-14, -14), (0, 0), (-1, -1), (0, 0)],
+                 [(-14, -14), (-13, -13), (-1, -1), (0, 0)],
                  [(0, 0), (1, 1), (0, 0), (1, 1)],
                  [(1, 0), (2, 2), (1, 0), (2, 2)],
                  [(1, 0), (3, 3), (1, 0), (3, 3)]],

pynumdiff/tests/test_optimize.py

@@ -38,7 +38,7 @@ def test_first_order():
                                   tvgamma=tvgamma, dxdt_truth=dxdt_truth)
     params_2, val_2 = first_order(x, dt, params=None, options={'iterate': True},
                                   tvgamma=0, dxdt_truth=None)
-    assert params_1 == [5]
+    assert params_1 == [2]
     assert params_2 == [1]
 
 def test_mediandiff():