Skip to content
This repository was archived by the owner on Oct 12, 2023. It is now read-only.

Ancestral sample#22

Open
DL42 wants to merge 301 commits into
molpopgen:ancestral_samplefrom
DL42:ancestral_sample
Open

Ancestral sample#22
DL42 wants to merge 301 commits into
molpopgen:ancestral_samplefrom
DL42:ancestral_sample

Conversation

@DL42

@DL42 DL42 commented Dec 11, 2018

Copy link
Copy Markdown
Contributor

reorganized ancestral sample branch

molpopgen and others added 30 commits February 5, 2018 15:51
…n of the mutation in fwdpp vector (which in turn has the position and metadata info)
shouldn't be necessary if arg_tracker is constructed with correct starting index (only needed for starting simulation with initialized tree as opposed to a blank simulation)
also fixes a couple of code comments
adding mutation and site tables using info from ancestry tracker and optional initial tree with metadata for each

metadata for ancestry tracker is pickled fwdpy11 mutation type, default metadata for mutations from initial tree is added if none present (as would be if tree from msprime)
code in wfarg and setup commented out, removed in evolve_arg, README updated
provide an override variable to __call__ which overrides the gc interval and forces simplification
…test_evolve)

edgesets to edges in test_evolve, import namedtuple, check to make sure mutation array has mutations, parantheses errors,
small change to README, gitignore ignores pyc files, comment out async/queue functions in evolve_functions header, slight addendum to override parameter
Make sure breakpoints are generated
also added caculating time_appending back in
changes in fwdpy11 allow easy construction of fwdpy11 mutation type from unpickled metadata
use ancestry_processor's num_nodes to set next_index (if next_index == 0, initialize a tracker with newly created "parent" nodes)
David Lawrie and others added 24 commits July 12, 2019 05:39
msprime: for split populations, mutation rate was being set by final population 1 pop size instead of initial population pop 1 size, only affects Figure 2B,2D,2E
2E: simulations was being called with split-recovery model (which doesn't currently exist in fwdpy11 as of right now), should've been called with pure split model
…package, use eta for Fst, add symbols for BGS plots, remove msprime results from plot2.pdf, put non-duplication msprime vs fwdpy11 into supplemental figure
@DL42 DL42 force-pushed the ancestral_sample branch from 6d40cac to 932a7ae Compare December 5, 2019 05:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants