Skip to content

constify C stats api #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 2, 2020
Merged

constify C stats api #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 6 additions & 23 deletions c/tests/test_stats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ typedef struct {

static int
general_stat_error(
size_t TSK_UNUSED(K), double *TSK_UNUSED(X), size_t M, double *Y, void *params)
size_t TSK_UNUSED(K), const double *TSK_UNUSED(X), size_t M, double *Y, void *params)
{
int ret = 0;
CU_ASSERT_FATAL(M == 1);
Expand Down Expand Up @@ -417,10 +417,6 @@ verify_node_general_stat_errors(tsk_treeseq_t *ts)
verify_summary_func_errors(ts, TSK_STAT_NODE);
}

typedef int one_way_weighted_method(tsk_treeseq_t *self, tsk_size_t num_weights,
double *weights, tsk_size_t num_windows, double *windows, double *result,
tsk_flags_t options);

static void
verify_one_way_weighted_func_errors(tsk_treeseq_t *ts, one_way_weighted_method *method)
{
Expand All @@ -442,14 +438,9 @@ verify_one_way_weighted_func_errors(tsk_treeseq_t *ts, one_way_weighted_method *
free(weights);
}

typedef int one_way_weighted_covariate_method(tsk_treeseq_t *self,
tsk_size_t num_weights, double *weights, tsk_size_t num_covariates,
double *covariates, tsk_size_t num_windows, double *windows, double *result,
tsk_flags_t options);

static void
verify_one_way_weighted_covariate_func_errors(
tsk_treeseq_t *ts, one_way_weighted_covariate_method *method)
tsk_treeseq_t *ts, one_way_covariates_method *method)
{
// we don't have any specific errors for this function
// but we might add some in the future
Expand All @@ -470,12 +461,8 @@ verify_one_way_weighted_covariate_func_errors(
free(weights);
}

typedef int one_way_stat_method(tsk_treeseq_t *self, tsk_size_t num_sample_sets,
tsk_size_t *sample_set_sizes, tsk_id_t *sample_sets, tsk_size_t num_windows,
double *windows, double *result, tsk_flags_t options);

static void
verify_one_way_stat_func_errors(tsk_treeseq_t *ts, one_way_stat_method *method)
verify_one_way_stat_func_errors(tsk_treeseq_t *ts, one_way_sample_stat_method *method)
{
int ret;
tsk_id_t num_nodes = (tsk_id_t) tsk_treeseq_get_num_nodes(ts);
Expand Down Expand Up @@ -522,11 +509,6 @@ verify_one_way_stat_func_errors(tsk_treeseq_t *ts, one_way_stat_method *method)
CU_ASSERT_EQUAL_FATAL(ret, TSK_ERR_BAD_WINDOWS);
}

typedef int general_sample_stat_method(tsk_treeseq_t *self, tsk_size_t num_sample_sets,
tsk_size_t *sample_set_sizes, tsk_id_t *sample_sets, tsk_size_t num_indexes,
tsk_id_t *indexes, tsk_size_t num_windows, double *windows, double *result,
tsk_flags_t options);

static void
verify_two_way_stat_func_errors(tsk_treeseq_t *ts, general_sample_stat_method *method)
{
Expand Down Expand Up @@ -630,7 +612,8 @@ verify_four_way_stat_func_errors(tsk_treeseq_t *ts, general_sample_stat_method *
}

static int
general_stat_identity(size_t K, double *restrict X, size_t M, double *Y, void *params)
general_stat_identity(
size_t K, const double *restrict X, size_t M, double *Y, void *params)
{
size_t k;
CU_ASSERT_FATAL(M == K);
Expand Down Expand Up @@ -703,7 +686,7 @@ verify_branch_general_stat_identity(tsk_treeseq_t *ts)
}

static int
general_stat_sum(size_t K, double *restrict X, size_t M, double *Y, void *params)
general_stat_sum(size_t K, const double *restrict X, size_t M, double *Y, void *params)
{
size_t k, m;
double s = 0;
Expand Down
2 changes: 1 addition & 1 deletion c/tests/test_trees.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ verify_trees(tsk_treeseq_t *ts, tsk_size_t num_trees, tsk_id_t *parents)
size_t num_nodes = tsk_treeseq_get_num_nodes(ts);
size_t num_sites = tsk_treeseq_get_num_sites(ts);
size_t num_mutations = tsk_treeseq_get_num_mutations(ts);
double *breakpoints = tsk_treeseq_get_breakpoints(ts);
const double *breakpoints = tsk_treeseq_get_breakpoints(ts);

ret = tsk_tree_init(&tree, ts, 0);
CU_ASSERT_EQUAL(ret, 0);
Expand Down
Loading