removed min number sample sets requirement

petrelharp · petrelharp · commit 4b8755fee208 · 2025-09-09T20:56:51.000-07:00
diff --git a/c/tests/test_stats.c b/c/tests/test_stats.c
@@ -881,9 +881,6 @@ verify_two_way_stat_func_errors(
     ret = method(ts, 0, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
         options | TSK_STAT_SITE, &result);
     CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
-    ret = method(ts, 1, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
-        options | TSK_STAT_SITE, &result);
-    CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
 
     ret = method(ts, 2, sample_set_sizes, samples, 0, set_indexes, 0, NULL,
         options | TSK_STAT_SITE, &result);
@@ -938,12 +935,6 @@ verify_three_way_stat_func_errors(tsk_treeseq_t *ts, general_sample_stat_method
     ret = method(ts, 0, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
         TSK_STAT_SITE, &result);
     CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
-    ret = method(ts, 1, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
-        TSK_STAT_SITE, &result);
-    CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
-    ret = method(ts, 2, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
-        TSK_STAT_SITE, &result);
-    CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
 
     ret = method(ts, 3, sample_set_sizes, samples, 0, set_indexes, 0, NULL,
         TSK_STAT_SITE, &result);
@@ -972,15 +963,6 @@ verify_four_way_stat_func_errors(tsk_treeseq_t *ts, general_sample_stat_method *
     ret = method(ts, 0, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
         TSK_STAT_SITE, &result);
     CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
-    ret = method(ts, 1, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
-        TSK_STAT_SITE, &result);
-    CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
-    ret = method(ts, 2, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
-        TSK_STAT_SITE, &result);
-    CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
-    ret = method(ts, 3, sample_set_sizes, samples, 1, set_indexes, 0, NULL,
-        TSK_STAT_SITE, &result);
-    CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
 
     ret = method(ts, 4, sample_set_sizes, samples, 0, set_indexes, 0, NULL,
         TSK_STAT_SITE, &result);
diff --git a/c/tskit/trees.c b/c/tskit/trees.c
@@ -4470,12 +4470,12 @@ tsk_treeseq_pi2_unbiased(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
  ***********************************/
 
 static int
-check_sample_stat_inputs(tsk_size_t num_sample_sets, tsk_size_t min_num_sample_sets,
-    tsk_size_t tuple_size, tsk_size_t num_index_tuples, const tsk_id_t *index_tuples)
+check_sample_stat_inputs(tsk_size_t num_sample_sets, tsk_size_t tuple_size,
+    tsk_size_t num_index_tuples, const tsk_id_t *index_tuples)
 {
     int ret = 0;
 
-    if (num_sample_sets < min_num_sample_sets) {
+    if (num_sample_sets < 1) {
         ret = tsk_trace_error(TSK_ERR_INSUFFICIENT_SAMPLE_SETS);
         goto out;
     }
@@ -4520,7 +4520,7 @@ tsk_treeseq_divergence(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
     const double *windows, tsk_flags_t options, double *result)
 {
     int ret = 0;
-    ret = check_sample_stat_inputs(num_sample_sets, 2, 2, num_index_tuples, index_tuples);
+    ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);
     if (ret != 0) {
         goto out;
     }
@@ -4585,7 +4585,7 @@ tsk_treeseq_genetic_relatedness(const tsk_treeseq_t *self, tsk_size_t num_sample
 {
     int ret = 0;
     // we want to allow self comparisons
-    ret = check_sample_stat_inputs(num_sample_sets, 1, 2, num_index_tuples, index_tuples);
+    ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);
     if (ret != 0) {
         goto out;
     }
@@ -4730,7 +4730,7 @@ tsk_treeseq_Y2(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
     const double *windows, tsk_flags_t options, double *result)
 {
     int ret = 0;
-    ret = check_sample_stat_inputs(num_sample_sets, 2, 2, num_index_tuples, index_tuples);
+    ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);
     if (ret != 0) {
         goto out;
     }
@@ -4771,7 +4771,7 @@ tsk_treeseq_f2(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
     const double *windows, tsk_flags_t options, double *result)
 {
     int ret = 0;
-    ret = check_sample_stat_inputs(num_sample_sets, 2, 2, num_index_tuples, index_tuples);
+    ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);
     if (ret != 0) {
         goto out;
     }
@@ -4817,7 +4817,7 @@ tsk_treeseq_Y3(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
     const double *windows, tsk_flags_t options, double *result)
 {
     int ret = 0;
-    ret = check_sample_stat_inputs(num_sample_sets, 3, 3, num_index_tuples, index_tuples);
+    ret = check_sample_stat_inputs(num_sample_sets, 3, num_index_tuples, index_tuples);
     if (ret != 0) {
         goto out;
     }
@@ -4860,7 +4860,7 @@ tsk_treeseq_f3(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
     const double *windows, tsk_flags_t options, double *result)
 {
     int ret = 0;
-    ret = check_sample_stat_inputs(num_sample_sets, 3, 3, num_index_tuples, index_tuples);
+    ret = check_sample_stat_inputs(num_sample_sets, 3, num_index_tuples, index_tuples);
     if (ret != 0) {
         goto out;
     }
@@ -4909,7 +4909,7 @@ tsk_treeseq_f4(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,
     const double *windows, tsk_flags_t options, double *result)
 {
     int ret = 0;
-    ret = check_sample_stat_inputs(num_sample_sets, 4, 4, num_index_tuples, index_tuples);
+    ret = check_sample_stat_inputs(num_sample_sets, 4, num_index_tuples, index_tuples);
     if (ret != 0) {
         goto out;
     }

Original file line number	Diff line number	Diff line change
`@@ -4470,12 +4470,12 @@ tsk_treeseq_pi2_unbiased(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,`
`4470`	`4470`	`***********************************/`
`4471`	`4471`
`4472`	`4472`	`static int`
`4473`		`-check_sample_stat_inputs(tsk_size_t num_sample_sets, tsk_size_t min_num_sample_sets,`
`4474`		`- tsk_size_t tuple_size, tsk_size_t num_index_tuples, const tsk_id_t *index_tuples)`
	`4473`	`+check_sample_stat_inputs(tsk_size_t num_sample_sets, tsk_size_t tuple_size,`
	`4474`	`+ tsk_size_t num_index_tuples, const tsk_id_t *index_tuples)`
`4475`	`4475`	`{`
`4476`	`4476`	`int ret = 0;`
`4477`	`4477`
`4478`		`- if (num_sample_sets < min_num_sample_sets) {`
	`4478`	`+ if (num_sample_sets < 1) {`
`4479`	`4479`	`ret = tsk_trace_error(TSK_ERR_INSUFFICIENT_SAMPLE_SETS);`
`4480`	`4480`	`goto out;`
`4481`	`4481`	`}`
`@@ -4520,7 +4520,7 @@ tsk_treeseq_divergence(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,`
`4520`	`4520`	`const double windows, tsk_flags_t options, double result)`
`4521`	`4521`	`{`
`4522`	`4522`	`int ret = 0;`
`4523`		`- ret = check_sample_stat_inputs(num_sample_sets, 2, 2, num_index_tuples, index_tuples);`
	`4523`	`+ ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);`
`4524`	`4524`	`if (ret != 0) {`
`4525`	`4525`	`goto out;`
`4526`	`4526`	`}`
`@@ -4585,7 +4585,7 @@ tsk_treeseq_genetic_relatedness(const tsk_treeseq_t *self, tsk_size_t num_sample`
`4585`	`4585`	`{`
`4586`	`4586`	`int ret = 0;`
`4587`	`4587`	`// we want to allow self comparisons`
`4588`		`- ret = check_sample_stat_inputs(num_sample_sets, 1, 2, num_index_tuples, index_tuples);`
	`4588`	`+ ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);`
`4589`	`4589`	`if (ret != 0) {`
`4590`	`4590`	`goto out;`
`4591`	`4591`	`}`
`@@ -4730,7 +4730,7 @@ tsk_treeseq_Y2(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,`
`4730`	`4730`	`const double windows, tsk_flags_t options, double result)`
`4731`	`4731`	`{`
`4732`	`4732`	`int ret = 0;`
`4733`		`- ret = check_sample_stat_inputs(num_sample_sets, 2, 2, num_index_tuples, index_tuples);`
	`4733`	`+ ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);`
`4734`	`4734`	`if (ret != 0) {`
`4735`	`4735`	`goto out;`
`4736`	`4736`	`}`
`@@ -4771,7 +4771,7 @@ tsk_treeseq_f2(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,`
`4771`	`4771`	`const double windows, tsk_flags_t options, double result)`
`4772`	`4772`	`{`
`4773`	`4773`	`int ret = 0;`
`4774`		`- ret = check_sample_stat_inputs(num_sample_sets, 2, 2, num_index_tuples, index_tuples);`
	`4774`	`+ ret = check_sample_stat_inputs(num_sample_sets, 2, num_index_tuples, index_tuples);`
`4775`	`4775`	`if (ret != 0) {`
`4776`	`4776`	`goto out;`
`4777`	`4777`	`}`
`@@ -4817,7 +4817,7 @@ tsk_treeseq_Y3(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,`
`4817`	`4817`	`const double windows, tsk_flags_t options, double result)`
`4818`	`4818`	`{`
`4819`	`4819`	`int ret = 0;`
`4820`		`- ret = check_sample_stat_inputs(num_sample_sets, 3, 3, num_index_tuples, index_tuples);`
	`4820`	`+ ret = check_sample_stat_inputs(num_sample_sets, 3, num_index_tuples, index_tuples);`
`4821`	`4821`	`if (ret != 0) {`
`4822`	`4822`	`goto out;`
`4823`	`4823`	`}`
`@@ -4860,7 +4860,7 @@ tsk_treeseq_f3(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,`
`4860`	`4860`	`const double windows, tsk_flags_t options, double result)`
`4861`	`4861`	`{`
`4862`	`4862`	`int ret = 0;`
`4863`		`- ret = check_sample_stat_inputs(num_sample_sets, 3, 3, num_index_tuples, index_tuples);`
	`4863`	`+ ret = check_sample_stat_inputs(num_sample_sets, 3, num_index_tuples, index_tuples);`
`4864`	`4864`	`if (ret != 0) {`
`4865`	`4865`	`goto out;`
`4866`	`4866`	`}`
`@@ -4909,7 +4909,7 @@ tsk_treeseq_f4(const tsk_treeseq_t *self, tsk_size_t num_sample_sets,`
`4909`	`4909`	`const double windows, tsk_flags_t options, double result)`
`4910`	`4910`	`{`
`4911`	`4911`	`int ret = 0;`
`4912`		`- ret = check_sample_stat_inputs(num_sample_sets, 4, 4, num_index_tuples, index_tuples);`
	`4912`	`+ ret = check_sample_stat_inputs(num_sample_sets, 4, num_index_tuples, index_tuples);`
`4913`	`4913`	`if (ret != 0) {`
`4914`	`4914`	`goto out;`
`4915`	`4915`	`}`