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

Change end time inequality #1521

Merged
merged 1 commit into from
Mar 15, 2021
Merged

Change end time inequality #1521

merged 1 commit into from
Mar 15, 2021

Conversation

apragsdale
Copy link
Contributor

Closes #1304

Some tests are still failing here.. trying to figure out what's going on

@codecov
Copy link

codecov bot commented Mar 10, 2021

Codecov Report

Merging #1521 (1cf5a99) into main (824bc44) will not change coverage.
The diff coverage is 80.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1521   +/-   ##
=======================================
  Coverage   91.37%   91.37%           
=======================================
  Files          23       23           
  Lines       10105    10105           
  Branches     2119     2119           
=======================================
  Hits         9233     9233           
  Misses        438      438           
  Partials      434      434           
Flag Coverage Δ
C 91.37% <80.00%> (ø)
python 98.77% <ø> (ø)

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

Impacted Files Coverage Δ
msprime/ancestry.py 99.40% <ø> (ø)
lib/msprime.c 85.77% <80.00%> (ø)

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 824bc44...1cf5a99. Read the comment docs.

@apragsdale
Copy link
Contributor Author

I fiddled with tests a bit to get them to pass. There were a few testing the timing of some events when it equaled the set end time, of course, so would be good to check that I haven't made those tests useless.

Also, two tests were failing in lib/tests/ancestry.c, and I'm wondering if lines 373 and 489 should be changed to ret = msp_run(&msp, 10.0-1e-6, ULONG_MAX);..?

@jeromekelleher
Copy link
Member

Excellent, thanks @apragsdale! Yes, I think you're right we can change those C tests. This does mean that our semantics wrt events like sampling etc is slightly different than before, I guess it's unlikely anyone is actually depending on this. This is the sort of stuff we want to break for 1.0 anyway, while we're breaking stuff.

We should add a note to the CHANGELOG to make sure we don't forget to tell people about it, though.l

@apragsdale
Copy link
Contributor Author

Ok, changelog updated. Let me know if you want any changes made here, or if I should rebase/etc

@jeromekelleher
Copy link
Member

Looks great, thanks @apragsdale. I think we just need to update the documentation for the end_time parameter, squash and we're good to merge.

@apragsdale
Copy link
Contributor Author

apragsdale commented Mar 15, 2021

Is this ok to merge? Not sure what to do about the one codecov failure here..

@jeromekelleher
Copy link
Member

@Mergifyio please rebase

@mergify
Copy link
Contributor

mergify bot commented Mar 15, 2021

Sorry but I didn't understand the command. Please consult the commands documentation 📚.

@jeromekelleher
Copy link
Member

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Mar 15, 2021

Sorry but I didn't understand the command. Please consult the commands documentation 📚.

@jeromekelleher
Copy link
Member

@Mergifyio rebase

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.

LGTM, thanks @apragsdale!

@mergify
Copy link
Contributor

mergify bot commented Mar 15, 2021

Command rebase: success

Branch has been successfully rebased

@apragsdale
Copy link
Contributor Author

Thanks Jerome - glad to get this sorted!

@jeromekelleher
Copy link
Member

Thanks for sorting it out @apragsdale!

@mergify mergify bot merged commit e06b5b8 into tskit-dev:main Mar 15, 2021
@apragsdale apragsdale deleted the end_time branch March 25, 2021 21:13
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.

Behavior of end_time when using "dtwf" model
2 participants