Re-generate example data

bodkan · May 13, 2024 · 65ca97f · 65ca97f
1 parent 36e10ee
commit 65ca97f
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/inst/extdata/models/introgression/script.slim b/inst/extdata/models/introgression/script.slim
@@ -179,12 +179,10 @@ s0 late() /* Log the start of the simulation */ {
 }
 
 s1 late() /* Population splits */ {
-    pops = filter(POPULATIONS, "tsplit_gen", c(1, community.tick - BURNIN_LENGTH));
+    pops = filter(POPULATIONS, "tsplit_gen", community.tick - BURNIN_LENGTH);
 
     for (i in seqLen(num_rows(pops))) {
         pop = pops.getRowValues(i);
-        // skip over ancestral populations, who have been created in generation 1
-        if (community.tick > 1 & pop.getValue("tsplit_gen") == 1) next;
         create_pop(pop);
     }
 

diff --git a/inst/extdata/models/introgression_msprime.trees b/inst/extdata/models/introgression_msprime.trees
diff --git a/inst/extdata/models/introgression_slim.trees b/inst/extdata/models/introgression_slim.trees
diff --git a/inst/extdata/models/msprime.trees b/inst/extdata/models/msprime.trees
diff --git a/inst/scripts/script.slim b/inst/scripts/script.slim
@@ -179,12 +179,10 @@ s0 late() /* Log the start of the simulation */ {
 }
 
 s1 late() /* Population splits */ {
-    pops = filter(POPULATIONS, "tsplit_gen", c(1, community.tick - BURNIN_LENGTH));
+    pops = filter(POPULATIONS, "tsplit_gen", community.tick - BURNIN_LENGTH);
 
     for (i in seqLen(num_rows(pops))) {
         pop = pops.getRowValues(i);
-        // skip over ancestral populations, who have been created in generation 1
-        if (community.tick > 1 & pop.getValue("tsplit_gen") == 1) next;
         create_pop(pop);
     }