Update after adjusting recombination length calculation

nickjcroucher · Apr 24, 2024 · a7da2e2 · a7da2e2
1 parent a03944b
commit a7da2e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/tests/check_branch_sequences.c b/tests/check_branch_sequences.c
@@ -117,15 +117,15 @@ int test_bases_in_recombinations_with_gaps(int block_size)
 
 START_TEST (check_calculate_number_of_bases_in_recombations)
 {
-	ck_assert(test_bases_in_recombinations(4) == 25);
-	ck_assert(test_bases_in_recombinations(3) == 20);
-	ck_assert(test_bases_in_recombinations(2) == 15);
-	ck_assert(test_bases_in_recombinations(1) == 5);
+  ck_assert(test_bases_in_recombinations(4) == 27);
+	ck_assert(test_bases_in_recombinations(3) == 23);
+	ck_assert(test_bases_in_recombinations(2) == 17);
+	ck_assert(test_bases_in_recombinations(1) == 6);
 
-	ck_assert(test_bases_in_recombinations_with_gaps(4) == 22);
-	ck_assert(test_bases_in_recombinations_with_gaps(3) == 17);
-	ck_assert(test_bases_in_recombinations_with_gaps(2) == 12);
-	ck_assert(test_bases_in_recombinations_with_gaps(1) == 2);
+	ck_assert(test_bases_in_recombinations_with_gaps(4) == 24);
+	ck_assert(test_bases_in_recombinations_with_gaps(3) == 20);
+	ck_assert(test_bases_in_recombinations_with_gaps(2) == 14);
+	ck_assert(test_bases_in_recombinations_with_gaps(1) == 3);
 }
 END_TEST
 

diff --git a/tests/data/recombination_at_root/expected_RAxML_result.recombination_at_root.iteration_1.tab b/tests/data/recombination_at_root/expected_RAxML_result.recombination_at_root.iteration_1.tab
@@ -1,18 +1,18 @@
 FT   misc_feature    339..978
 FT                   /node="Node_1->sequence_two"
-FT                   /neg_log_likelihood="77.517338"
+FT                   /neg_log_likelihood="77.539411"
 FT                   /colour="4"
 FT                   /taxa="sequence_two"
 FT                   /SNP_count="32"
 FT   misc_feature    11421..12388
 FT                   /node="Node_3->Node_2"
-FT                   /neg_log_likelihood="266.061457"
+FT                   /neg_log_likelihood="266.166621"
 FT                   /colour="2"
 FT                   /taxa=" sequence_four sequence_one"
 FT                   /SNP_count="209"
 FT   misc_feature    25..429
 FT                   /node="Node_3->Node_2"
-FT                   /neg_log_likelihood="35.854004"
+FT                   /neg_log_likelihood="35.864561"
 FT                   /colour="2"
 FT                   /taxa=" sequence_four sequence_one"
 FT                   /SNP_count="10"