Skip to content

Commit 0b0e591

Browse files
committed
More C coverage
1 parent 3616fcb commit 0b0e591

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

c/tests/test_stats.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ verify_pair_coalescence_rates(tsk_treeseq_t *ts)
533533
tsk_size_t sample_set_sizes[P];
534534
tsk_id_t index_tuples[2 * I];
535535
tsk_id_t node_bin_map[N];
536+
tsk_id_t empty_node_bin_map[N];
536537
tsk_size_t dim = T * B * I;
537538
double C[dim];
538539
tsk_size_t i, j, k;
@@ -544,6 +545,7 @@ verify_pair_coalescence_rates(tsk_treeseq_t *ts)
544545
node_bin_map[i] = (tsk_id_t) j;
545546
}
546547
}
548+
empty_node_bin_map[i] = TSK_NULL;
547549
}
548550

549551
for (i = 0; i < n; i++) {
@@ -568,13 +570,17 @@ verify_pair_coalescence_rates(tsk_treeseq_t *ts)
568570
ret = tsk_treeseq_pair_coalescence_rates(ts, P, sample_set_sizes, sample_sets, I,
569571
index_tuples, T, breakpoints, B, node_bin_map, epochs, 0, C);
570572
CU_ASSERT_EQUAL_FATAL(ret, 0);
573+
/* TODO: compare against naive coalescence rates per tree */
571574

572575
node_bin_map[0] = TSK_NULL;
573576
ret = tsk_treeseq_pair_coalescence_rates(ts, P, sample_set_sizes, sample_sets, I,
574577
index_tuples, T, breakpoints, B, node_bin_map, epochs, 0, C);
575578
CU_ASSERT_EQUAL_FATAL(ret, 0);
576579
node_bin_map[0] = 0;
577-
/* TODO: compare against naive coalescence rates per tree */
580+
581+
ret = tsk_treeseq_pair_coalescence_rates(ts, P, sample_set_sizes, sample_sets, I,
582+
index_tuples, T, breakpoints, B, empty_node_bin_map, epochs, 0, C);
583+
CU_ASSERT_EQUAL_FATAL(ret, 0);
578584

579585
/* cover errors */
580586
ret = tsk_treeseq_pair_coalescence_rates(ts, P, sample_set_sizes, sample_sets, I,

c/tskit/trees.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9256,7 +9256,7 @@ pair_coalescence_quantiles(tsk_size_t input_dim, const double *weight,
92569256
j = 0;
92579257
coalesced = 0.0;
92589258
timepoint = -INFINITY;
9259-
/* TODO: binary search might be better */
9259+
/* TODO: may be more efficient to use a binary search */
92609260
for (i = 0; i < input_dim; i++) {
92619261
if (weight[i] > 0) {
92629262
coalesced += weight[i];

0 commit comments

Comments
 (0)