Support all-nodes matching in LSHMM#2861
Draft
jeromekelleher wants to merge 6 commits intotskit-dev:mainfrom
Draft
Support all-nodes matching in LSHMM#2861jeromekelleher wants to merge 6 commits intotskit-dev:mainfrom
jeromekelleher wants to merge 6 commits intotskit-dev:mainfrom
Conversation
773b66c to
fa78171
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## main #2861 +/- ##
==========================================
- Coverage 89.69% 89.68% -0.02%
==========================================
Files 30 30
Lines 30159 30159
Branches 5860 5856 -4
==========================================
- Hits 27052 27048 -4
- Misses 1778 1780 +2
- Partials 1329 1331 +2
Flags with carried forward coverage won't be shown. Click here to find out more. see 3 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
This file contains hidden or 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
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.
Currently a WIP, but the idea is to support all-nodes matching a-la tsinfer in the LS HMM.
It turns out that this is significantly different to the "samples-only" approach that is currently implemented here, because the interpretation of the likelihoods per-tree node is different. For samples only (and especially the "leaf samples only" version we have currently implemented) the internal node likelihood values are really just for compression, and there's no actual semantics to their values. Then, using standard parsimony algorithms works well because the arbitrary choices made to do compression are perfectly OK.
However, when each node of the tree has a well-defined likelihood that we want to preserve, parsimony is much more difficult.
I think the main difference then is how we compress the likelihoods, and so for now I've just put in a quick hack to do both approaches by having different compression methods for each. We could probably just use the "tsinfer-like" compression approach for samples only, as well, but I wanted to keep the parsimony version around for a while in case it's much more performant.
Other than that, things seem to be working OK, but there are definitely some tricky issues to resolve along the way, which I'll keep plugging at. The plan is to provide an option to the API at the top-level though, as
match_all_nodesormatch_samples. I think this is flexible enough, given that you can simplify down to specific subsets of nodes if you want.cc @szhan @astheeggeggs