Skip to content
Snippets Groups Projects
Commit 5ce1e0d9 authored by Peter Lünenschloß's avatar Peter Lünenschloß
Browse files

Merge branch 'interpolationFix' into 'develop'

Interpolation fix

See merge request !443
parents 395e9a1b e3e2fc92
No related branches found
No related tags found
6 merge requests!685Release 2.4,!684Release 2.4,!567Release 2.2.1,!566Release 2.2,!501Release 2.1,!443Interpolation fix
Pipeline #78870 passed with stage
in 2 minutes and 36 seconds
...@@ -30,8 +30,10 @@ This changelog starts with version 2.0.0. Basically all parts of the system, inc ...@@ -30,8 +30,10 @@ This changelog starts with version 2.0.0. Basically all parts of the system, inc
- `DmpScheme`: set `DFILTER_DEFAULT` to 1 in order to not mask the flag 'OK' - `DmpScheme`: set `DFILTER_DEFAULT` to 1 in order to not mask the flag 'OK'
- `correctDrift`: fixed bug when correcting single value intervals - `correctDrift`: fixed bug when correcting single value intervals
- `concatFlags`: fixed bug in context of squeezed history appending (UNTOUCHED vs UNFLAGGED information now doesnt get lost) - `concatFlags`: fixed bug in context of squeezed history appending (UNTOUCHED vs UNFLAGGED information now doesnt get lost)
- `interpolateInvalid`: Fix: replacement of flags for interpolated values now works
- `resample`: resampling func now actually gets passed on to `history.appy()` - `resample`: resampling func now actually gets passed on to `history.appy()`
## [2.0.1](https://git.ufz.de/rdm-software/saqc/-/tags/v2.0.1) - 2021-12-20 ## [2.0.1](https://git.ufz.de/rdm-software/saqc/-/tags/v2.0.1) - 2021-12-20
[List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.0.0...v2.0.1) [List of commits](https://git.ufz.de/rdm-software/saqc/-/compare/v2.0.0...v2.0.1)
### Added ### Added
......
...@@ -186,9 +186,9 @@ def interpolateInvalid( ...@@ -186,9 +186,9 @@ def interpolateInvalid(
inter_limit=limit, inter_limit=limit,
downgrade_interpolation=downgrade, downgrade_interpolation=downgrade,
) )
data[field] = inter_data
interpolated = data[field].isna() & inter_data.notna() interpolated = data[field].isna() & inter_data.notna()
data[field] = inter_data
new_col = pd.Series(np.nan, index=flags[field].index) new_col = pd.Series(np.nan, index=flags[field].index)
new_col.loc[interpolated] = np.nan if flag is None else flag new_col.loc[interpolated] = np.nan if flag is None else flag
......
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