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

Wallinga fix #93

Merged
merged 4 commits into from May 18, 2020
Merged

Wallinga fix #93

merged 4 commits into from May 18, 2020

Conversation

jstockwin
Copy link
Collaborator

Pull Request
Closes #92

  • Fixes a bug where draw_one_set_of_ancestries would return a result of the wrong length. It would calculate the length based on the time window, but everything else is based on T. I am not familiar with the actual maths involved here, so please do check this is correct.

  • Fixes a bug where ot was not defined.

How has this been tested
Examples were given in #92, and these now work correctly.

Checklist

  • I have added tests to prove my changes work
  • I have added documentation where required
  • I have updated NEWS.md with a short description of my change

@jstockwin jstockwin requested a review from zkamvar April 22, 2020 11:10
@jstockwin
Copy link
Collaborator Author

@zkamvar Any chance you could take a look at this?

@annecori
Copy link
Collaborator

@jstockwin I am happy with your changes to the code, thanks for that. Not sure about tests etc, so can you please check that and merge yourself if you are happy the tests pass? Thanks

@jstockwin
Copy link
Collaborator Author

@annecori actually when you click through they pass.. I'm re-running now

@jstockwin
Copy link
Collaborator Author

hmm ok I was wrong - the tests are still failing, but only on xcode. Will try and find a way to fix that...

@jstockwin jstockwin merged commit 1848c90 into master May 18, 2020
@jstockwin jstockwin deleted the wallinga-fix branch May 18, 2020 10:50
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.

Error calling wallinga_teunis (length mismatch)
2 participants