[MRG] Refactor the gather code so that it uses 'hashes' instead of 'mins' #1329
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
Codecov Report
@@ Coverage Diff @@
## latest #1329 +/- ##
==========================================
+ Coverage 88.73% 94.06% +5.33%
==========================================
Files 123 96 -27
Lines 18125 14510 -3615
Branches 1399 1399
==========================================
- Hits 16083 13649 -2434
+ Misses 1803 622 -1181
Partials 239 239
Flags with carried forward coverage won't be shown. Click here to find out more. Continue to review full report at Codecov.
|
|
Ready for review @luizirber |
|
sigh, or @bluegenes too :) |
|
ok ready for review & maybe merge :). This doesn't change anything so there's no real urgency. |
bluegenes
reviewed
Feb 15, 2021
src/sourmash/search.py
Outdated
|
|
||
| # calculate fractions wrt second denominator - metagenome size | ||
| orig_query_mh = orig_query_mh.downsample(scaled=cmp_scaled) | ||
| query_n_mins = len(orig_query_mh) | ||
| f_unique_to_query = len(intersect_mins) / float(query_n_mins) | ||
| query_n_hashes = len(orig_query_mh) # @CTB reuse ^^^? |
There was a problem hiding this comment.
just calling attn to your note here -- not sure if there's something else you wanted to do here
bluegenes
approved these changes
Feb 15, 2021
|
thanks! a bit more cleanup, if tests pass I will merge. |
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.
During #1328, I got annoyed at the code in
search.py:gather_databasesbecause it used the oldminsterminology and not the newhashesterminology. So I fixed it.No functional changes, internal refactoring only.
NOTE: contains changes from #1328, so we should merge that one first. Or merge this into that one.
Checklist
make testDid it pass the tests?make coverageIs the new code covered?without a major version increment. Changing file formats also requires a
major version number increment.
changes were made?