Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SaQC
Manage
Activity
Members
Labels
Plan
Issues
35
Issue boards
Milestones
Wiki
Code
Merge requests
7
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
rdm-software
SaQC
Commits
25a78327
Commit
25a78327
authored
4 years ago
by
David Schäfer
Browse files
Options
Downloads
Patches
Plain Diff
silence some of the deprecation warnings
parent
c07d788a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!193
Release 1.4
,
!188
Release 1.4
Pipeline
#6894
failed with stages
in 6 minutes and 11 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
saqc/core/core.py
+4
-3
4 additions, 3 deletions
saqc/core/core.py
saqc/funcs/functions.py
+3
-2
3 additions, 2 deletions
saqc/funcs/functions.py
with
7 additions
and
5 deletions
saqc/core/core.py
+
4
−
3
View file @
25a78327
...
...
@@ -9,7 +9,7 @@ TODOS:
import
logging
from
copy
import
deepcopy
from
typing
import
List
,
Tuple
,
Dict
,
Any
,
Callable
from
typing
import
Any
,
Dict
,
List
import
pandas
as
pd
import
dios
...
...
@@ -91,7 +91,7 @@ def _setup():
# NOTE:
# the import is needed to trigger the registration
# of the built-in (test-)functions
import
saqc.func
s
pas
s
# warnings
pd
.
set_option
(
"
mode.chained_assignment
"
,
"
warn
"
)
...
...
@@ -288,7 +288,8 @@ def _saqcCallFunc(func_dump, data, flagger):
# Any newly assigned column can safely be ignored by masking, thus
# this check comes after setting `columns`
if
field
not
in
flagger
.
getFlags
():
flagger
=
flagger
.
merge
(
flagger
.
initFlags
(
data
=
pd
.
Series
(
name
=
field
)))
flagger
=
flagger
.
merge
(
flagger
.
initFlags
(
data
=
pd
.
Series
(
name
=
field
,
dtype
=
np
.
float64
)))
data_in
,
mask
=
_maskData
(
data
,
flagger
,
columns
,
to_mask
)
data_result
,
flagger_result
=
func
(
data_in
,
field
,
flagger
,
*
func_args
,
func_name
=
func_name
,
**
func_kws
)
...
...
This diff is collapsed.
Click to expand it.
saqc/funcs/functions.py
+
3
−
2
View file @
25a78327
...
...
@@ -9,7 +9,6 @@ import pandas as pd
import
dtw
import
pywt
from
mlxtend.evaluate
import
permutation_test
import
datetime
from
saqc.lib.tools
import
groupConsecutives
,
sesonalMask
...
...
@@ -209,7 +208,9 @@ def flagGeneric(data, field, flagger, func, nodata=np.nan, **kwargs):
raise
TypeError
(
f
"
generic expression does not return a boolean array
"
)
if
flagger
.
getFlags
(
field
).
empty
:
flagger
=
flagger
.
merge
(
flagger
.
initFlags
(
data
=
pd
.
Series
(
name
=
field
,
index
=
mask
.
index
)))
flagger
=
flagger
.
merge
(
flagger
.
initFlags
(
data
=
pd
.
Series
(
name
=
field
,
index
=
mask
.
index
,
dtype
=
np
.
float64
)))
flagger
=
flagger
.
setFlags
(
field
,
mask
,
**
kwargs
)
return
data
,
flagger
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment