💨 formatting + adding more tests

Author: jonasvdd

tests/test_algos_python_compliance.py

@@ -6,22 +6,22 @@
     LTTBDownsampler,
     M4Downsampler,
     MinMaxDownsampler,
-    # MinMaxLTTBDownsampler,
+    MinMaxLTTBDownsampler,
     NaNFPCSDownsampler,
     NaNM4Downsampler,
     NaNMinMaxDownsampler,
-    # NaNMinMaxLTTBDownsampler,
+    NaNMinMaxLTTBDownsampler,
 )
 from tsdownsample._python.downsamplers import (
     FPCS_py,
     LTTB_py,
     M4_py,
     MinMax_py,
-    # MinMaxLTTB_py,
+    MinMaxLTTB_py,
     NaNFPCS_py,
     NaNM4_py,
     NaNMinMax_py,
-    # NaNMinMaxLTTB_py,
+    NaNMinMaxLTTB_py,
 )
 
 
@@ -31,12 +31,12 @@
         (MinMaxDownsampler(), MinMax_py()),
         (M4Downsampler(), M4_py()),
         (LTTBDownsampler(), LTTB_py()),
-        # (MinMaxLTTBDownsampler(), MinMaxLTTB_py()),
+        (MinMaxLTTBDownsampler(), MinMaxLTTB_py()),
         (FPCSDownsampler(), FPCS_py()),
         # Include NaN downsamplers
         (NaNMinMaxDownsampler(), NaNMinMax_py()),
         (NaNM4Downsampler(), NaNM4_py()),
-        # (NaNMinMaxLTTBDownsampler(), NaNMinMaxLTTB_py()),
+        (NaNMinMaxLTTBDownsampler(), NaNMinMaxLTTB_py()),
         (NaNFPCSDownsampler(), NaNFPCS_py()),
     ],
 )
@@ -63,7 +63,7 @@ def test_resampler_accordance(rust_python_pair, n, n_out):
     [
         (NaNMinMaxDownsampler(), NaNMinMax_py()),
         (NaNM4Downsampler(), NaNM4_py()),
-        # (NaNMinMaxLTTBDownsampler(), NaNMinMaxLTTB_py()),
+        (NaNMinMaxLTTBDownsampler(), NaNMinMaxLTTB_py()),
         (NaNFPCSDownsampler(), NaNFPCS_py()),
     ],
 )

tests/test_tsdownsample.py

@@ -6,10 +6,12 @@
 
 from tsdownsample import (  # MeanDownsampler,; MedianDownsampler,
     EveryNthDownsampler,
+    FPCSDownsampler,
     LTTBDownsampler,
     M4Downsampler,
     MinMaxDownsampler,
     MinMaxLTTBDownsampler,
+    NaNFPCSDownsampler,
     NaNM4Downsampler,
     NaNMinMaxDownsampler,
     NaNMinMaxLTTBDownsampler,
@@ -28,12 +30,14 @@
     M4Downsampler(),
     LTTBDownsampler(),
     MinMaxLTTBDownsampler(),
+    FPCSDownsampler(),
 ]
 
 RUST_NAN_DOWNSAMPLERS = [
     NaNMinMaxDownsampler(),
     NaNM4Downsampler(),
     NaNMinMaxLTTBDownsampler(),
+    NaNFPCSDownsampler(),
 ]
 
 OTHER_DOWNSAMPLERS = [EveryNthDownsampler()]
@@ -167,8 +171,12 @@ def test_downsampling_with_gaps_in_x(downsampler: AbstractDownsampler):
     idx = np.arange(len(arr))
     idx[: len(idx) // 2] += len(idx) // 2  # add large gap in x
     s_downsampled = downsampler.downsample(idx, arr, n_out=100)
-    assert len(s_downsampled) <= 100
-    assert len(s_downsampled) >= 66
+    if "FPCS" in downsampler.__class__.__name__:
+        assert len(s_downsampled) >= 100
+        assert len(s_downsampled) <= 200
+    else:
+        assert len(s_downsampled) <= 100
+        assert len(s_downsampled) >= 66
 
 
 @pytest.mark.parametrize("downsampler", generate_rust_downsamplers())

tsdownsample/_python/downsamplers.py

@@ -93,7 +93,7 @@ def _downsample(
                 LTTB_py._argmax_area(
                     prev_x=x[a],
                     prev_y=y[a],
-                    # NOTE: In a 100% correct implementation of LTTB the next x average 
+                    # NOTE: In a 100% correct implementation of LTTB the next x average
                     # should be implemented as the following:
                     # avg_next_x=np.mean(x[offset[i + 1] : offset[i + 2]]),
                     # To improve performance we use the following approximation