Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SaQC
Manage
Activity
Members
Labels
Plan
Issues
36
Issue boards
Milestones
Wiki
Code
Merge requests
8
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
133abce4
Commit
133abce4
authored
5 years ago
by
Peter Lünenschloß
Browse files
Options
Downloads
Patches
Plain Diff
changed 'only-one-variable-present' criteria to data.empty
parent
5211dc5c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
saqc/funcs/harm_functions.py
+2
-2
2 additions, 2 deletions
saqc/funcs/harm_functions.py
with
2 additions
and
2 deletions
saqc/funcs/harm_functions.py
+
2
−
2
View file @
133abce4
...
...
@@ -737,7 +737,7 @@ def _toMerged(
flags
.
drop
(
fieldname
,
axis
=
"
columns
"
,
errors
=
"
ignore
"
,
inplace
=
True
)
# first case: there is no data, the data-to-insert would have to be merged with, and also are we not deharmonizing:
if
(
flags
.
empty
)
&
(
target_index
is
None
):
if
data
.
empty
&
(
target_index
is
None
):
return
data_to_insert
.
to_frame
(
name
=
fieldname
),
flagger_to_insert
# if thats not the case: generate the drop mask for the remaining data:
...
...
@@ -762,7 +762,7 @@ def _toMerged(
else
:
# trivial case: there is only one variable:
if
flags
.
empty
:
if
data
.
empty
:
data
=
data_to_insert
.
reindex
(
target_index
).
to_frame
(
name
=
fieldname
)
flags
=
flags_to_insert
.
reindex
(
target_index
,
fill_value
=
flagger
.
UNFLAGGED
)
return
data
,
flagger
.
initFlags
(
flags
=
flags
)
...
...
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