Skip to content

Commit c536518

Browse files
committed
shorten sequence and reduce the number of replicates
refactor smck verification test (remove usless superclass) simplify ooa
1 parent 8b6acb5 commit c536518

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

verification.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4528,9 +4528,10 @@ def test_smc_num_trees(self):
45284528
pyplot.close("all")
45294529

45304530

4531-
class SmckvsSMCK(Test):
4531+
class SmcKTest(Test):
45324532
"""
4533-
Tests for the SMC(k) approximation coalescent against the SMC(k) model.
4533+
Tests for the SMCK model.
4534+
SMC(0) is compared against rejection sampling SMC (SmcApproxCoalescent).
45344535
"""
45354536

45364537
models = {
@@ -4653,12 +4654,6 @@ def _run(self, **kwargs):
46534654
self.plot_SmcKApprox_smcK_stats(df)
46544655
self.plot_tree_intervals(df)
46554656

4656-
4657-
class SmcKTest(SmckvsSMCK):
4658-
"""
4659-
Tests for the SMC(0) model against rejection sampling.
4660-
"""
4661-
46624657
def test_smc_k_oldest_time(self):
46634658
"""
46644659
Runs the check for number of trees using the CLI.
@@ -4950,7 +4945,7 @@ def test_smck_vs_smckapprox_multiple_bottleneck(self):
49504945
)
49514946

49524947
def test_out_of_africa_migration_model(self):
4953-
s_no = 10
4948+
s_no = 1
49544949
samples = {
49554950
"YRI": s_no,
49564951
"CEU": s_no,
@@ -4960,7 +4955,7 @@ def test_out_of_africa_migration_model(self):
49604955
"ANC": s_no,
49614956
}
49624957
recombination_map = msprime.RateMap(
4963-
position=[0, 100, 500, 900, 1200, 1500, 2000],
4958+
position=[0, 50, 250, 450, 600, 750, 1000],
49644959
rate=[0.00001, 0, 0.0002, 0.00005, 0, 0.001],
49654960
)
49664961

@@ -4972,7 +4967,7 @@ def test_out_of_africa_migration_model(self):
49724967
discrete_genome=True,
49734968
demography=msprime.Demography._ooa_model(),
49744969
record_migrations=True,
4975-
num_replicates=50,
4970+
num_replicates=20,
49764971
model=model_cls,
49774972
)
49784973

0 commit comments

Comments
 (0)