From 0827282320cfa1cba08f955a9461d889f21f99ec Mon Sep 17 00:00:00 2001 From: szhan Date: Fri, 21 Jun 2024 13:28:41 +0100 Subject: [PATCH] Update tests --- tests/test_api_fb_diploid.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/test_api_fb_diploid.py b/tests/test_api_fb_diploid.py index a092beb..c46864d 100644 --- a/tests/test_api_fb_diploid.py +++ b/tests/test_api_fb_diploid.py @@ -17,13 +17,12 @@ def verify(self, ts, scale_mutation_rate, include_ancestors): include_extreme_rates=True, ): G_vs = core.convert_haplotypes_to_phased_genotypes(H_vs) - s = core.convert_haplotypes_to_unphased_genotypes(query) F_vs, c_vs, ll_vs = fbd.forward_ls_dip_loop( n=n, m=m, G=G_vs, - s=s, + s=query, e=e_vs, r=r, norm=True, @@ -32,7 +31,7 @@ def verify(self, ts, scale_mutation_rate, include_ancestors): n=n, m=m, G=G_vs, - s=s, + s=query, e=e_vs, c=c_vs, r=r, @@ -66,7 +65,7 @@ def test_ts_simple_n10_no_recomb(self, scale_mutation_rate, include_ancestors): ts = self.get_ts_simple_n10_no_recomb() self.verify(ts, scale_mutation_rate, include_ancestors) - @pytest.mark.parametrize("num_samples", [4, 8, 16]) + @pytest.mark.parametrize("num_samples", [8, 16]) @pytest.mark.parametrize("scale_mutation_rate", [True, False]) @pytest.mark.parametrize("include_ancestors", [True, False]) def test_ts_simple(self, num_samples, scale_mutation_rate, include_ancestors): @@ -75,13 +74,13 @@ def test_ts_simple(self, num_samples, scale_mutation_rate, include_ancestors): @pytest.mark.parametrize("scale_mutation_rate", [True, False]) @pytest.mark.parametrize("include_ancestors", [True, False]) - def test_ts_simple_n8_high_recomb(self, scale_mutation_rate, include_ancestors): + def ts_simple_n8_high_recomb(self, scale_mutation_rate, include_ancestors): ts = self.get_ts_simple_n8_high_recomb() self.verify(ts, scale_mutation_rate, include_ancestors) @pytest.mark.parametrize("scale_mutation_rate", [True, False]) @pytest.mark.parametrize("include_ancestors", [True, False]) - def test_ts_larger(self, scale_mutation_rate, include_ancestors): + def ts_larger(self, scale_mutation_rate, include_ancestors): ts = self.get_ts_custom_pars( num_samples=30, seq_length=1e5, mean_r=1e-5, mean_mu=1e-5 )