Two-way two-locus statistics (python proto)

c/tests/test_stats.c

@@ -2870,8 +2870,7 @@ test_two_site_correlated_multiallelic(void)
     double truth_D2[4] = { 0.023844603634269844, 0.02384460363426984,
         0.02384460363426984, 0.02384460363426984 };
     double truth_r2[4] = { 1, 1, 1, 1 };
-    double truth_D_prime[4] = { 0.7777777777777777, 0.4444444444444444,
-        0.4444444444444444, 0.6666666666666666 };
+    double truth_D_prime[4] = { 0, -0.5, -0.5, 0 };
     double truth_r[4] = { 0.18377223398316206, -0.12212786219416509,
         -0.12212786219416509, 0.2609542781331212 };
     double truth_Dz[4] = { 0.0033870175616860566, 0.003387017561686057,
@@ -3003,8 +3002,8 @@ test_two_site_uncorrelated_multiallelic(void)
     double truth_D[4] = { 0.05555555555555555, 0.0, 0.0, 0.05555555555555555 };
     double truth_D2[4] = { 0.024691358024691357, 0.0, 0.0, 0.024691358024691357 };
     double truth_r2[4] = { 1, 0, 0, 1 };
-    double truth_D_prime[4] = { 0.6666666666666665, 0.0, 0.0, 0.6666666666666665 };
-    double truth_r[4] = { 0.24999999999999997, 0.0, 0.0, 0.24999999999999997 };
+    double truth_D_prime[4] = { 0.0, 0.0, 0.0, 0.0 };
+    double truth_r[4] = { 0.25, 0.0, 0.0, 0.25 };
     double truth_Dz[4] = { 0.0, 0.0, 0.0, 0.0 };
     double truth_pi2[4] = { 0.04938271604938272, 0.04938271604938272,
         0.04938271604938272, 0.04938271604938272 };

c/tskit/trees.c

@@ -4231,7 +4231,7 @@ tsk_treeseq_D_prime(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
 {
     options |= TSK_STAT_POLARISED; // TODO: allow user to pick?
     return tsk_treeseq_two_locus_count_stat(self, num_sample_sets, sample_set_sizes,
-        sample_sets, num_sample_sets, NULL, D_prime_summary_func, norm_hap_weighted,
+        sample_sets, num_sample_sets, NULL, D_prime_summary_func, norm_total_weighted,
         num_rows, row_sites, row_positions, num_cols, col_sites, col_positions, options,
         result);
 }