Merge branch 'isunflagged' into 'develop'

introduced isunflagged

See merge request !678

saqc/funcs/breaks.py

@@ -25,7 +25,7 @@ import pandas as pd
 from saqc import BAD, FILTER_ALL
 from saqc.core import flagging, register
 from saqc.funcs.changepoints import _getChangePoints
-from saqc.lib.tools import isflagged
+from saqc.lib.tools import isunflagged
 
 if TYPE_CHECKING:
     from saqc.core.core import SaQC
@@ -65,7 +65,7 @@ class BreaksMixin:
         datacol = self._data[field]
         mask = datacol.isna()
 
-        mask = ~isflagged(self._flags[field], dfilter) & mask
+        mask = isunflagged(self._flags[field], dfilter) & mask
 
         self._flags[mask, field] = flag
         return self
@@ -223,6 +223,6 @@ class BreaksMixin:
             result="mask",
         )
 
-        mask = ~isflagged(self._flags[field], dfilter) & mask
+        mask = isunflagged(self._flags[field], dfilter) & mask
         self._flags[mask, field] = flag
         return self

saqc/funcs/generic.py

@@ -14,7 +14,7 @@ import pandas as pd
 
 from saqc import BAD, FILTER_ALL
 from saqc.core import DictOfSeries, Flags, register
-from saqc.lib.tools import isAllBoolean, isflagged, toSequence
+from saqc.lib.tools import isAllBoolean, isflagged, isunflagged, toSequence
 from saqc.parsing.environ import ENVIRONMENT
 
 if TYPE_CHECKING:
@@ -286,7 +286,7 @@ class GenericMixin:
                 self._flags[col] = pd.Series(np.nan, index=mask.index)
 
             # respect existing flags
-            mask = ~isflagged(self._flags[col], thresh=dfilter) & mask
+            mask = isunflagged(self._flags[col], thresh=dfilter) & mask
 
             # dummy column to ensure consistency between flags and data
             if col not in self._data:

saqc/funcs/noise.py

@@ -15,7 +15,7 @@ import pandas as pd
 
 from saqc.constants import BAD
 from saqc.core.register import flagging
-from saqc.lib.tools import isflagged, statPass
+from saqc.lib.tools import isunflagged, statPass
 
 if TYPE_CHECKING:
     from saqc import SaQC
@@ -95,6 +95,6 @@ class NoiseMixin:
             sub_thresh,
             min_periods,
         )
-        mask = ~isflagged(self._flags[field], kwargs["dfilter"]) & to_set
+        mask = isunflagged(self._flags[field], kwargs["dfilter"]) & to_set
         self._flags[mask, field] = flag
         return self

saqc/lib/tools.py

@@ -526,6 +526,10 @@ def isflagged(flagscol: A, thresh: float) -> A:
     return flagscol >= thresh
 
 
+def isunflagged(flagscol: A, thresh: float) -> A:
+    return ~isflagged(flagscol, thresh)
+
+
 def getUnionIndex(obj, default: pd.DatetimeIndex | None = None):
     assert hasattr(obj, "columns")
     if default is None: