From 9895af61788837886be8b30fdb2baf46f9f0724a Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sat, 9 Oct 2010 21:07:48 +0200 Subject: [PATCH] Use cast macros --- src/language/stats/binomial.c | 10 +++++----- src/language/stats/sign.c | 3 ++- src/language/stats/wilcoxon.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c index 3287509c..8126daf3 100644 --- a/src/language/stats/binomial.c +++ b/src/language/stats/binomial.c @@ -88,15 +88,15 @@ calculate_binomial_internal (double n1, double n2, double p) static bool do_binomial (const struct dictionary *dict, struct casereader *input, - const struct binomial_test *bst, + const struct one_sample_test *ost, struct freq *cat1, struct freq *cat2, enum mv_class exclude ) { + const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent); bool warn = true; - const struct one_sample_test *ost = (const struct one_sample_test *) bst; struct ccase *c; for (; (c = casereader_read (input)) != NULL; case_unref (c)) @@ -155,8 +155,8 @@ binomial_execute (const struct dataset *ds, { int v; const struct dictionary *dict = dataset_dict (ds); - const struct binomial_test *bst = (const struct binomial_test *) test; - const struct one_sample_test *ost = (const struct one_sample_test*) test; + const struct one_sample_test *ost = UP_CAST (test, const struct one_sample_test, parent); + const struct binomial_test *bst = UP_CAST (ost, const struct binomial_test, parent); struct freq *cat[2]; int i; @@ -179,7 +179,7 @@ binomial_execute (const struct dataset *ds, } } - if (do_binomial (dataset_dict (ds), input, bst, cat[0], cat[1], exclude)) + if (do_binomial (dataset_dict (ds), input, ost, cat[0], cat[1], exclude)) { const struct variable *wvar = dict_get_weight (dict); const struct fmt_spec *wfmt = wvar ? diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c index 754b0d7d..38489113 100644 --- a/src/language/stats/sign.c +++ b/src/language/stats/sign.c @@ -80,6 +80,7 @@ output_frequency_table (const struct two_sample_test *t2s, ds_put_cstr (&pair_name, " - "); ds_put_cstr (&pair_name, var_to_string ((*vp)[1])); + tab_text (table, 0, 1 + i * 4, TAB_LEFT, ds_cstr (&pair_name)); ds_destroy (&pair_name); @@ -168,7 +169,7 @@ sign_execute (const struct dataset *ds, int i; bool warn = true; const struct dictionary *dict = dataset_dict (ds); - const struct two_sample_test *t2s = (const struct two_sample_test *) test; + const struct two_sample_test *t2s = UP_CAST (test, const struct two_sample_test, parent); struct ccase *c; struct sign_test_params *stp = xcalloc (sizeof *stp, t2s->n_pairs); diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c index e917f7ba..268296d7 100644 --- a/src/language/stats/wilcoxon.c +++ b/src/language/stats/wilcoxon.c @@ -79,7 +79,7 @@ wilcoxon_execute (const struct dataset *ds, int i; bool warn = true; const struct dictionary *dict = dataset_dict (ds); - const struct two_sample_test *t2s = (struct two_sample_test *) test; + const struct two_sample_test *t2s = UP_CAST (test, const struct two_sample_test, parent); struct wilcoxon_state *ws = xcalloc (sizeof (*ws), t2s->n_pairs); const struct variable *weight = dict_get_weight (dict); -- 2.30.2