Skip to content

Conversation

@GertjanBisschop
Copy link
Member

First pass at the C level edge array (#2304).

@codecov
Copy link

codecov bot commented Jun 15, 2022

Codecov Report

Merging #2340 (c8eb484) into main (6b30807) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #2340   +/-   ##
=======================================
  Coverage   93.29%   93.30%           
=======================================
  Files          28       28           
  Lines       26789    26797    +8     
  Branches     1233     1233           
=======================================
+ Hits        24994    25002    +8     
  Misses       1762     1762           
  Partials       33       33           
Flag Coverage Δ
c-tests 92.25% <100.00%> (+<0.01%) ⬆️
lwt-tests 89.05% <ø> (ø)
python-c-tests 71.17% <ø> (ø)
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.99% <100.00%> (+0.01%) ⬆️

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 6b30807...c8eb484. Read the comment docs.

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! One reword of the docs.

c/tskit/trees.h Outdated
Comment on lines 180 to 182
@brief The edge encoding the relationship between u and its parent is
edge[u]. Equal to``TSK_NULL`` if node u is a root or is not a node in
the current tree.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
@brief The edge encoding the relationship between u and its parent is
edge[u]. Equal to``TSK_NULL`` if node u is a root or is not a node in
the current tree.
@brief Array of edge ids where ``edge[u]`` is the edge that encodes the relationship between child node ``u`` and its
parent. Equal to``TSK_NULL`` if node ``u`` is a root, virtual root or is not a node in the current tree.

Copy link
Member

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

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

Great work, thanks @GertjanBisschop!

@GertjanBisschop GertjanBisschop force-pushed the add_edge_array branch 3 times, most recently from f87107b to 498c0d9 Compare June 19, 2022 21:22
@benjeffery
Copy link
Member

@Mergifyio refresh

@mergify
Copy link
Contributor

mergify bot commented Jun 21, 2022

refresh

✅ Pull request refreshed

@benjeffery
Copy link
Member

Circle CI AWOL again....

@benjeffery
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Jun 21, 2022

rebase

✅ Branch has been successfully rebased

@mergify mergify bot merged commit 0bb7488 into tskit-dev:main Jun 21, 2022
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.

3 participants