MRG: fix ANI from non-rocksdb gather output #361
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Jun 19, 2024
|
This PR should wait for sourmash-bio/sourmash#3218 to be merged and a new version of sourmash-rs core to be released, and then we can update it and put it up for merge! |
ctb
added a commit
to sourmash-bio/sourmash
that referenced
this pull request
Jun 19, 2024
Calculate ANI of matches against original query with `f_orig_query` and `f_match_orig`, instead of against `f_unique_to_query` and `f_match`. This fixes the ANI differences between `sourmash gather` and RocksDB branchwater gather for the columns `query_containment_ani`, `match_containment_ani`, `max_containment_ani`, and `average_containment_ani`. Refs: * Used by sourmash-bio/sourmash_plugin_branchwater#361 * Fixes RocksDB-based calculations for sourmash-bio/sourmash_plugin_branchwater#331
…water into fix_gather_ani
ctb
changed the title
This was referenced Jun 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Calculate ANI of matches against original query with
f_orig_queryandf_match_orig, instead of againstf_unique_to_queryandf_match.This fixes the ANI differences between
sourmash gatherand non-RocksDB branchwater gather for the columnsquery_containment_ani,match_containment_ani,max_containment_ani, andaverage_containment_ani.This also brings in the sourmash core working branch sourmash-bio/sourmash#3218 which fixes the RocksDB-based numbers.
Fixes #331 🎉