Skip to content
Snippets Groups Projects
Commit 4676ca1e authored by Bert Palm's avatar Bert Palm 🎇
Browse files

fixed GL 220 - flagVariance one off, and blackified

parent 5459d9c1
No related branches found
No related tags found
No related merge requests found
Pipeline #46739 passed with stage
in 1 minute and 41 seconds
......@@ -136,7 +136,7 @@ def flagByVariance(
maxna = np.inf
if maxna_group is None:
max_consecutive = np.inf
maxna_group = np.inf
min_periods = int(np.ceil(pd.Timedelta(window) / pd.Timedelta(delta)))
window = pd.Timedelta(window)
......@@ -149,5 +149,5 @@ def flagByVariance(
min_periods=min_periods,
)
flags[to_set[to_set].index, field] = flag
flags[to_set, field] = flag
return data, flags
......@@ -69,5 +69,5 @@ def flagByStatLowPass(
to_set = statPass(
datcol, func, window, thresh, operator.gt, sub_window, sub_thresh, min_periods
)
flags[to_set[to_set].index, field] = flag
flags[to_set, field] = flag
return data, flags
......@@ -618,7 +618,7 @@ def statPass(
for exceed, group in exceeds.groupby(by=exceeds.values):
if exceed:
# dt-slices include both bounds, so we subtract 1ns
start = group.index[0] - (winsz - pd.Timedelta('1ns'))
start = group.index[0] - (winsz - pd.Timedelta("1ns"))
end = group.index[-1]
to_set[start:end] = True
......
......@@ -32,7 +32,6 @@ def test_constants_flagBasic(data):
assert np.all(flagscol[25 + 1 :] == UNFLAGGED)
@pytest.mark.skip(reason="see Issue: https://git.ufz.de/rdm-software/saqc/-/issues/220")
def test_constants_flagVarianceBased(data):
expected = np.arange(5, 25)
field, *_ = data.columns
......
......@@ -43,8 +43,9 @@ def test_statPass():
data, flags = flagByStatLowPass(
data, "data", flags, np.std, "20D", 0.999, "5D", 0.999, 0, flag=BAD
)
assert (flags["data"] == BAD).sum() == 21
assert (flags["data"][200:210] < BAD).all()
assert (flags["data"].iloc[:100] == UNFLAGGED).all()
assert (flags["data"].iloc[100:120] == BAD).all()
assert (flags["data"].iloc[121:] == UNFLAGGED).all()
def test_flagRange(data, field):
......
......@@ -131,7 +131,7 @@ def test_flagsSurviveBackprojection():
def test_harmSingleVarIntermediateFlagging(data, reshaper):
flags = initFlagsLike(data)
field = "data"
freq = '15T'
freq = "15T"
pre_data = data.copy()
pre_flags = flags.copy()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment