-
Notifications
You must be signed in to change notification settings - Fork 95
Update to EarlyWolfAdmixture_6F14 (CanFam) #1802
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
Open
David-Peede
wants to merge
5
commits into
popsim-consortium:main
Choose a base branch
from
David-Peede:update-dog-demographic-model-Freedman14
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ec62c28
Fixed the divergence times, per generation migration rates, and sanit…
David-Peede 75dc7fb
Updated the CanFam long description and added clarifying comments
David-Peede b7ced50
Update stdpopsim/catalog/CanFam/demographic_models.py
David-Peede 3f4dc50
Update stdpopsim/catalog/CanFam/demographic_models.py
David-Peede 8a504b9
Update stdpopsim/catalog/CanFam/demographic_models.py
David-Peede File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Looking from the outside, I'm not sure what "total migration rate" means. Is this something like "probability of migration in total across this branch"? Seems like we should either say that more precisely, or instead insert here the per-gen migration rate; either way we should put the units on "Migration rate".
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.
also perhaps these should clarify if this is forwards-time or reverse-time migration rates?
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.
Total migration rate is the term we use for this, and I suggest keeping it. I admit it is a bit confusing but I couldn't find a better name. The rationale for adding "total" was that this is an accumulated rate along the entire time migration was active. Since rates are additive in the time units, it made sense to think of this as the "total rate".
BTW, I noticed that there is another model in the catalog that uses total rates (OutOfAfricaExtendedNeandertalAdmixturePulse_3I21). I like the approach used there, where the parameter name is called "Total migration rate" and the description provides the explanation. I think that units are clear from this context. What do you think, @petrelharp?
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.
That sounds good, and I think it's what @David-Peede has done in this PR now (since the explanation now explains this)?