Skip to content
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.

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

Implement improved mrca. #1313

Merged
merged 1 commit into from
Apr 19, 2021
Merged

Implement improved mrca. #1313

merged 1 commit into from
Apr 19, 2021

Conversation

jeromekelleher
Copy link
Member

Closes #1309

Implements @feilchenfeldt's beautifully elegant mrca algorithm discussed in #1306

Would you mind taking a look at the diff please @feilchenfeldt?

@codecov
Copy link

codecov bot commented Apr 16, 2021

Codecov Report

Merging #1313 (4a0a5de) into main (759f0bb) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1313   +/-   ##
=======================================
  Coverage   93.81%   93.81%           
=======================================
  Files          26       26           
  Lines       22189    22174   -15     
  Branches     1006     1006           
=======================================
- Hits        20816    20803   -13     
+ Misses       1340     1338    -2     
  Partials       33       33           
Flag Coverage Δ
c-tests 92.44% <100.00%> (+<0.01%) ⬆️
lwt-tests 92.97% <ø> (ø)
python-c-tests 95.14% <ø> (ø)
python-tests 98.86% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
c/tskit/trees.c 94.87% <100.00%> (+0.04%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 759f0bb...4a0a5de. Read the comment docs.

Copy link

@feilchenfeldt feilchenfeldt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The algorithm looks good to me.

Copy link
Member

@benjeffery benjeffery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, great stuff.
PInging @JSaha20 as it was mentioned she would be interested in the changes.

@benjeffery benjeffery added the AUTOMERGE-REQUESTED Ask Mergify to merge this PR label Apr 19, 2021
@mergify mergify bot merged commit 2f451c4 into tskit-dev:main Apr 19, 2021
@mergify
Copy link
Contributor

mergify bot commented Apr 19, 2021

This pull request has been merged with the
unsupported configuration option bot_account.

This option will be ignored starting May 1st, 2021, and removed
on June 1st, 2021.

This option can be replaced by update_bot_account, merge_bot_account or both
depending on your use-case (https://docs.mergify.io/actions/merge/).

@mergify mergify bot removed the AUTOMERGE-REQUESTED Ask Mergify to merge this PR label Apr 19, 2021
@jeromekelleher jeromekelleher deleted the mrca-stuff branch April 19, 2021 11:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove memory allocations from get_mrca C implementation.
3 participants