easy fixes

saqc/flagger/baseflagger.py

@@ -135,7 +135,7 @@ class BaseFlagger(ABC):
         If `force=False` (default) only flags with a lower priority are overwritten,
         otherwise, if `force=True`, flags are overwritten unconditionally.
         """
-        assert "iloc" not in kwargs, "deprecated keyword, iloc"
+        assert "iloc" not in kwargs, "deprecated keyword, `iloc=slice(i:j)`. Use eg. `loc=srs.index[i:j]` instead."
 
         assertScalar("field", field, optional=False)
         flag = self.BAD if flag is None else flag

test/core/test_reader.py

@@ -119,7 +119,7 @@ def test_configMultipleTests(data):
         data, flagger_expected = func(data, var, flagger_expected, **kwargs)
     _, flagger_result = run(writeIO(config), SimpleFlagger(), data)
 
-    assert np.all(flagger_result.getFlags() == flagger_expected.getFlags())
+    assert (flagger_result.getFlags() == flagger_expected.getFlags()).all(None)
 
 
 def test_configFile(data):

test/funcs/test_harm_funcs.py

@@ -183,7 +183,7 @@ def test_harmSingleVarIntermediateFlagging(data, flagger, reshaper, co_flagging)
             assert (~flagger.isFlagged(loc=d.index[7:]).squeeze()).all()
         if co_flagging is False:
             assert (
-                flagger.isFlagged().squeeze() == [False, False, False, False, True, False, True, False, False]
+                flagger.isFlagged().squeeze() == [False, False, False, False, True, False, False, False, False]
             ).all()
     if reshaper == "bshift":
         if co_flagging is True:
@@ -192,7 +192,7 @@ def test_harmSingleVarIntermediateFlagging(data, flagger, reshaper, co_flagging)
             assert (~flagger.isFlagged(loc=d.index[7:]).squeeze()).all()
         if co_flagging is False:
             assert (
-                flagger.isFlagged().squeeze() == [False, False, False, False, False, True, True, False, False]
+                flagger.isFlagged().squeeze() == [False, False, False, False, False, True, False, False, False]
             ).all()
     if reshaper == "fshift":
         if co_flagging is True:
@@ -201,7 +201,7 @@ def test_harmSingleVarIntermediateFlagging(data, flagger, reshaper, co_flagging)
             assert (~flagger.isFlagged(loc=d.index[5:]).squeeze()).all()
         if co_flagging is False:
             assert (
-                flagger.isFlagged().squeeze() == [False, False, False, False, True, False, True, False, False]
+                flagger.isFlagged().squeeze() == [False, False, False, False, True, False, False, False, False]
             ).all()
 
     flags = flagger.getFlags()
@@ -329,8 +329,8 @@ def test_multivariatHarmonization(multi_data, flagger, shift_comment):
 @pytest.mark.parametrize("method", INTERPOLATIONS2)
 def test_gridInterpolation(data, method):
     freq = "15min"
-    data = (data * np.sin(data)).append(data.shift(1, "2h")).shift(1, "3s")
     data = data.squeeze()
+    data = (data * np.sin(data)).append(data.shift(1, "2h")).shift(1, "3s")
     # we are just testing if the interpolation gets passed to the series without causing an error:
     _interpolateGrid(data, freq, method, order=1, agg_method="sum", downcast_interpolation=True)
     if method == "polynomial":
@@ -345,18 +345,18 @@ def test_outsortCrap(data, flagger):
 
     field = data.columns[0]
     flagger = flagger.initFlags(data)
-    flagger = flagger.setFlags(field, iloc=slice(5, 7))
+    flagger = flagger.setFlags(field, loc=data[field].index[5:7])
 
-    drop_index = data.index[5:7]
-    d, _ = _outsortCrap(data, field, flagger, drop_flags=flagger.BAD)
+    drop_index = data[field].index[5:7]
+    d, _ = _outsortCrap(data[field], field, flagger, drop_flags=flagger.BAD)
     assert drop_index.difference(d.index).equals(drop_index)
 
-    flagger = flagger.setFlags(field, iloc=slice(0, 1), flag=flagger.GOOD)
+    flagger = flagger.setFlags(field, loc=data[field].index[0:1], flag=flagger.GOOD)
     drop_index = drop_index.insert(-1, data.index[0])
-    d, _ = _outsortCrap(data, field, flagger, drop_flags=[flagger.BAD, flagger.GOOD],)
+    d, _ = _outsortCrap(data[field], field, flagger, drop_flags=[flagger.BAD, flagger.GOOD],)
     assert drop_index.sort_values().difference(d.index).equals(drop_index.sort_values())
 
-    f_drop, _ = _outsortCrap(data, field, flagger, drop_flags=[flagger.BAD, flagger.GOOD], return_drops=True,)
+    f_drop, _ = _outsortCrap(data[field], field, flagger, drop_flags=[flagger.BAD, flagger.GOOD], return_drops=True,)
     assert f_drop.index.sort_values().equals(drop_index.sort_values())
 
 

test/funcs/test_spikes_detection.py

@@ -98,6 +98,7 @@ def test_flagSpikesLimitRaise(dat, flagger):
     assert not flagger_result.isFlagged(field)[characteristics["drop"]].any()
 
 
+# see test/functs/conftest.py for the 'course_N'
 @pytest.mark.parametrize("flagger", TESTFLAGGER)
 @pytest.mark.parametrize("dat", [pytest.lazy_fixture("course_3")])
 def test_flagSpikesOddWater(dat, flagger):
@@ -105,12 +106,16 @@ def test_flagSpikesOddWater(dat, flagger):
     data2, characteristics = dat(periods=1000, initial_level=20, final_level=1, out_val=30)
     field = "dummy"
     fields = ["data1", "data2"]
-    data = pd.DataFrame({"data1": data1.squeeze(), "data2": data2.squeeze()}, index=data1.index)
+    s1, s2 = data1.squeeze(), data2.squeeze()
+    s1 = pd.Series(data=s1.values, index=s1.index)
+    s2 = pd.Series(data=s2.values, index=s1.index)
+    data = dios.DictOfSeries([s1, s2], columns=["data1", "data2"])
     flagger = flagger.initFlags(data)
     _, flagger_result = spikes_flagOddWater(
         data, field, flagger, fields=fields, bin_frac=50, trafo="np.log", iter_start=0.95, n_neighbors=10
     )
-    isflagged = flagger_result.isFlagged(field)
-    assert isflagged[characteristics['raise']].all()
-    assert not isflagged[characteristics['return']].any()
-    assert not isflagged[characteristics['drop']].any()
+    for field in fields:
+        isflagged = flagger_result.isFlagged(field)
+        assert isflagged[characteristics['raise']].all()
+        assert not isflagged[characteristics['return']].any()
+        assert not isflagged[characteristics['drop']].any()