-
Notifications
You must be signed in to change notification settings - Fork 92
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
Add Gutunkunst OOA QC #496
Conversation
Codecov Report
@@ Coverage Diff @@
## master #496 +/- ##
=======================================
Coverage 99.52% 99.52%
=======================================
Files 16 16
Lines 1464 1464
Branches 186 186
=======================================
Hits 1457 1457
Misses 2 2
Partials 5 5
Continue to review full report at Codecov.
|
tests/test_homo_sapiens.py
Outdated
class TestGutenkunstThreePopOutOfAfrica( | ||
unittest.TestCase, test_models.CatalogDemographicModelTestMixin): | ||
model = species.get_demographic_model("OutOfAfrica_3G09") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same issue here as for the ZigZag model, regarding the need to instead inherit from QcdCatalogDemographicModelTestMixin
.
Thanks for taking on these missing QC models @apragsdale! Should be a simple change to get them doing the checks. And when #304 and #305 are resolved, no one else will get caught on changing which superclass to inherit from! |
Thanks, I had forgotten that needed to be changed. Coming back to implement models a few months later really does make it clear where the docs could be filled in :) I can do some updating of the QC process documentation after these are finished up. |
I did find a mistake in the OOA model currently in the catalog: in demographic events, migration was not turned off between the African and Bottleneck populations after they are merged, so that migration between those populations continues into the distant past. I don't know if this will have affected any of the analyses in the paper, for example Figure 3 from the manuscript... But if so, we should probably discuss on the call tomorrow. |
That's a little worrying! @jeromekelleher can you comment on the likely behaviour of msprime here? Does a |
It definitely will, because migration will carry lineages back into the merged population, so you'll end up with longer expected Tmrcas for lineages still uncoalesced beyond that merger event. Since it's in the distant past, the effect will likely be small, but it will still be there. |
We don't touch the migration matrix when there's MassMigrations - decided events having side effects was confusing. @apragsdale, does this mean that the OOA model that's in the msprime docs is wrong too? (Ouch!) |
Oh no!! It certainly looks like it.. That's surprising that hasn't been caught before, really. I've used that example in the msprime docs a bunch of times and never noticed it either. |
I think this (and the Zigzag model) are ready to merge. Let me know if you need me to rebase at all again for one or both. |
I have no idea why Travis is unhappy here - it is something to do with conda. Help, @grahamgower? @jradrion? |
It's an unrelated problem, and it looks like its been failing for two weeks now. Travis is running fine for linux on python 3.6. The failing builds are for osx --- maybe somethign changed at the travis end, and the |
Travis build should be fixed now if you rebase @apragsdale. |
This and #498 are now both rebased. |
Yay, thanks!!! |
Implemented qc version of the 2009 OOA model (to close #492). I'm having issues getting the tests to catch if I made a mistake in implementation, and I think the development docs are out of date (specifically, item 5 under Demographic model review process, perhaps)? Do I need to add anything beyond
qc_model = homo_sapiens_qc.GutenkunstOOA()
to theTestGutenkunstThreePopOutOfAfrica
class intest_homo_sapiens.py
?