[MRG] Fix containment calculation for nodegraphs #1862
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
|
Change looks good - no tests? |
Codecov Report
@@ Coverage Diff @@
## latest #1862 +/- ##
==========================================
+ Coverage 82.26% 82.36% +0.10%
==========================================
Files 119 119
Lines 12918 12929 +11
Branches 1727 1727
==========================================
+ Hits 10627 10649 +22
+ Misses 2027 2016 -11
Partials 264 264
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
luizirber
force-pushed
the
lirber/nodegraph_containment
branch
from
dfccdd8 to
1c363da
Compare
luizirber
commented
Mar 5, 2022
Comment on lines
+438
to
+455
| #[test] | ||
| fn containment() { | ||
| let mut ng1: Nodegraph = Nodegraph::new(&[31], 3); | ||
| let mut ng2: Nodegraph = Nodegraph::new(&[31], 3); | ||
|
|
||
| (0..20).for_each(|i| { | ||
| if i % 2 == 0 { | ||
| ng1.count(i); | ||
| }; | ||
| ng2.count(i); | ||
| }); | ||
|
|
||
| assert_eq!(ng1.containment(&ng2), 1.0); | ||
| assert_eq!(ng1.similarity(&ng2), 0.5); | ||
| assert_eq!(ng1.unique_kmers(), 10); | ||
| assert_eq!(ng2.unique_kmers(), 20); | ||
| } | ||
|
|
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.
You might think after all these years I would not mess how to calculate containment from a Bloom Filter. Sadly, you are mistaken. Sigh.
This also means that #1138 probably works properly now 🙈
Ready for review and merge @sourmash-bio/devs