Skip to content

fix negative values issue with 'diff' #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2023
Merged

fix negative values issue with 'diff' #590

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gnomad/utils/annotations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,7 @@ def merge_freq_arrays(
:param farrays: List of frequency arrays to merge. First entry in the list is the primary array to which other arrays will be added or subtracted. All arrays must be on the same Table.
:param fmeta: List of frequency metadata for arrays being merged.
:param operation: Merge operation to perform. Options are "sum" and "diff". If "diff" is passed, the first freq array in the list will have the other arrays subtracted from it.
:param set_negatives_to_zero: If True, set negative array values to 0 for AC, AN, AF, and homozygote_count. If False, raise a ValueError. Default is True.
:param set_negatives_to_zero: If True, set negative array values to 0 for AC, AN, AF, and homozygote_count. If False, raise a ValueError. Default is False.
:param count_arrays: Dictionary of Lists of arrays containing counts to merge using the passed operation. Must use the same group indexing as fmeta. Keys are the descriptor names, values are Lists of arrays to merge. Default is None.
:return: Tuple of merged frequency array, frequency metadata list and if `count_arrays` is not None, a dictionary of merged count arrays.
"""
Expand Down Expand Up @@ -1141,6 +1141,7 @@ def _sum_or_diff_fields(
ann: (
hl.case()
.when(set_negatives_to_zero, hl.max(x[ann], 0))
.when(x[ann] >= 0, x[ann])
.or_error(negative_value_error_msg % "freq")
)
for ann in callstat_ann
Expand All @@ -1152,6 +1153,7 @@ def _sum_or_diff_fields(
new_counts_array_dict[k] = new_counts_array.map(
lambda x: hl.case()
.when(set_negatives_to_zero, hl.max(x, 0))
.when(x >= 0, x)
.or_error(negative_value_error_msg % "counts")
)

Expand Down