X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fbinomial.c;h=91910ee5102e5d28dc927a3404b129d9c908c8a9;hb=92c09e564002d356d20fc1e2e131027ef89f6748;hp=33c47989e74015025c9b5f3415da17f51bf81a01;hpb=661b9ee29cbb6b89c4ea53a05b8a4eb3a5028de0;p=pspp-builds.git diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c index 33c47989..91910ee5 100644 --- a/src/language/stats/binomial.c +++ b/src/language/stats/binomial.c @@ -22,13 +22,12 @@ #include #include -#include +#include #include #include #include #include #include -#include #include #include @@ -89,50 +88,47 @@ calculate_binomial_internal (double n1, double n2, double p) return sig1tailed ; } -static void +static bool do_binomial (const struct dictionary *dict, - const struct casefile *cf, + struct casereader *input, const struct binomial_test *bst, - struct freq *cat1, - struct freq *cat2, - const struct casefilter *filter + struct freq_mutable *cat1, + struct freq_mutable *cat2, + enum mv_class exclude ) { bool warn = true; const struct one_sample_test *ost = (const struct one_sample_test *) bst; struct ccase c; - struct casereader *r = casefile_get_reader (cf, NULL); - while (casereader_read(r, &c)) + while (casereader_read(input, &c)) { int v; - double w = - dict_get_case_weight (dict, &c, &warn); + double w = dict_get_case_weight (dict, &c, &warn); for (v = 0 ; v < ost->n_vars ; ++v ) { const struct variable *var = ost->vars[v]; const union value *value = case_data (&c, var); + int width = var_get_width (var); - if ( casefilter_variable_missing (filter, &c, var)) + if (var_is_value_missing (var, value, exclude)) break; if ( NULL == cat1[v].value ) { - cat1[v].value = value_dup (value, var_get_width (var)); + cat1[v].value = value_dup (value, width); cat1[v].count = w; } - else if ( 0 == compare_values (cat1[v].value, value, - var_get_width (var))) + else if ( 0 == compare_values (cat1[v].value, value, width)) cat1[v].count += w; else if ( NULL == cat2[v].value ) { - cat2[v].value = value_dup (value, var_get_width (var)); + cat2[v].value = value_dup (value, width); cat2[v].count = w; } - else if ( 0 == compare_values (cat2[v].value, value, - var_get_width (var))) + else if ( 0 == compare_values (cat2[v].value, value, width)) cat2[v].count += w; else if ( bst->category1 == SYSMIS) msg (ME, _("Variable %s is not dichotomous"), var_get_name (var)); @@ -140,24 +136,23 @@ do_binomial (const struct dictionary *dict, case_destroy (&c); } - casereader_destroy (r); + return casereader_destroy (input); } void binomial_execute (const struct dataset *ds, - const struct casefile *cf, - struct casefilter *filter, + struct casereader *input, + enum mv_class exclude, const struct npar_test *test) { int v; const struct binomial_test *bst = (const struct binomial_test *) test; const struct one_sample_test *ost = (const struct one_sample_test*) test; - struct freq *cat1 = xzalloc (sizeof (*cat1) * ost->n_vars); - struct freq *cat2 = xzalloc (sizeof (*cat1) * ost->n_vars); - struct tab_table *table ; + struct freq_mutable *cat1 = xzalloc (sizeof (*cat1) * ost->n_vars); + struct freq_mutable *cat2 = xzalloc (sizeof (*cat1) * ost->n_vars); assert ((bst->category1 == SYSMIS) == (bst->category2 == SYSMIS) ); @@ -175,95 +170,78 @@ binomial_execute (const struct dataset *ds, cat2->value = value_dup (&v, 0); } - do_binomial (dataset_dict(ds), cf, bst, cat1, cat2, filter); - - table = tab_create (7, ost->n_vars * 3 + 1, 0); - - tab_dim (table, tab_natural_dimensions); - - tab_title (table, _("Binomial Test")); - - tab_headers (table, 2, 0, 1, 0); - - tab_box (table, TAL_1, TAL_1, -1, TAL_1, - 0, 0, table->nc - 1, tab_nr(table) - 1 ); - - for (v = 0 ; v < ost->n_vars; ++v) + if (do_binomial (dataset_dict(ds), input, bst, cat1, cat2, exclude)) { - double n_total, sig; - const struct variable *var = ost->vars[v]; - tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3); - - /* Titles */ - tab_text (table, 0, 1 + v * 3, TAB_LEFT, - var_to_string (var)); - - tab_text (table, 1, 1 + v * 3, TAB_LEFT, - _("Group1")); - - tab_text (table, 1, 2 + v * 3, TAB_LEFT, - _("Group2")); + struct tab_table *table = tab_create (7, ost->n_vars * 3 + 1, 0); - tab_text (table, 1, 3 + v * 3, TAB_LEFT, - _("Total")); + tab_dim (table, tab_natural_dimensions); - /* Test Prop */ - tab_float (table, 5, 1 + v * 3, TAB_NONE, bst->p, 8, 3); + tab_title (table, _("Binomial Test")); - /* Category labels */ - tab_text (table, 2, 1 + v * 3, TAB_NONE, - var_get_value_name (var, cat1[v].value)); + tab_headers (table, 2, 0, 1, 0); - tab_text (table, 2, 2 + v * 3, TAB_NONE, - var_get_value_name (var, cat2[v].value)); + tab_box (table, TAL_1, TAL_1, -1, TAL_1, + 0, 0, table->nc - 1, tab_nr(table) - 1 ); - /* Observed N */ - tab_float (table, 3, 1 + v * 3, TAB_NONE, - cat1[v].count, 8, 0); + for (v = 0 ; v < ost->n_vars; ++v) + { + double n_total, sig; + const struct variable *var = ost->vars[v]; + tab_hline (table, TAL_1, 0, tab_nc (table) -1, 1 + v * 3); - tab_float (table, 3, 2 + v * 3, TAB_NONE, - cat2[v].count, 8, 0); + /* Titles */ + tab_text (table, 0, 1 + v * 3, TAB_LEFT, var_to_string (var)); + tab_text (table, 1, 1 + v * 3, TAB_LEFT, _("Group1")); + tab_text (table, 1, 2 + v * 3, TAB_LEFT, _("Group2")); + tab_text (table, 1, 3 + v * 3, TAB_LEFT, _("Total")); - n_total = cat1[v].count + cat2[v].count; + /* Test Prop */ + tab_float (table, 5, 1 + v * 3, TAB_NONE, bst->p, 8, 3); + /* Category labels */ + tab_text (table, 2, 1 + v * 3, TAB_NONE, + var_get_value_name (var, cat1[v].value)); + tab_text (table, 2, 2 + v * 3, TAB_NONE, + var_get_value_name (var, cat2[v].value)); - tab_float (table, 3, 3 + v * 3, TAB_NONE, - n_total, 8, 0); + /* Observed N */ + tab_float (table, 3, 1 + v * 3, TAB_NONE, cat1[v].count, 8, 0); + tab_float (table, 3, 2 + v * 3, TAB_NONE, cat2[v].count, 8, 0); - /* Observed Proportions */ + n_total = cat1[v].count + cat2[v].count; + tab_float (table, 3, 3 + v * 3, TAB_NONE, n_total, 8, 0); - tab_float (table, 4, 1 + v * 3, TAB_NONE, - cat1[v].count / n_total, 8, 3); + /* Observed Proportions */ + tab_float (table, 4, 1 + v * 3, TAB_NONE, + cat1[v].count / n_total, 8, 3); + tab_float (table, 4, 2 + v * 3, TAB_NONE, + cat2[v].count / n_total, 8, 3); + tab_float (table, 4, 3 + v * 3, TAB_NONE, + (cat1[v].count + cat2[v].count) / n_total, 8, 2); - tab_float (table, 4, 2 + v * 3, TAB_NONE, - cat2[v].count / n_total, 8, 3); + /* Significance */ + sig = calculate_binomial (cat1[v].count, cat2[v].count, bst->p); + tab_float (table, 6, 1 + v * 3, TAB_NONE, sig, 8, 3); + } - tab_float (table, 4, 3 + v * 3, TAB_NONE, - (cat1[v].count + cat2[v].count) / n_total, 8, 2); + tab_text (table, 2, 0, TAB_CENTER, _("Category")); + tab_text (table, 3, 0, TAB_CENTER, _("N")); + tab_text (table, 4, 0, TAB_CENTER, _("Observed Prop.")); + tab_text (table, 5, 0, TAB_CENTER, _("Test Prop.")); + tab_text (table, 6, 0, TAB_CENTER | TAT_PRINTF, + _("Exact Sig. (%d-tailed)"), + bst->p == 0.5 ? 2: 1); - /* Significance */ - sig = calculate_binomial (cat1[v].count, cat2[v].count, - bst->p); - - tab_float (table, 6, 1 + v * 3, TAB_NONE, - sig, 8, 3); + tab_vline (table, TAL_2, 2, 0, tab_nr (table) -1); + tab_submit (table); + } + + for (v = 0; v < ost->n_vars; v++) + { + free (cat1[v].value); + free (cat2[v].value); } - - tab_text (table, 2, 0, TAB_CENTER, _("Category")); - tab_text (table, 3, 0, TAB_CENTER, _("N")); - tab_text (table, 4, 0, TAB_CENTER, _("Observed Prop.")); - tab_text (table, 5, 0, TAB_CENTER, _("Test Prop.")); - - tab_text (table, 6, 0, TAB_CENTER | TAT_PRINTF, - _("Exact Sig. (%d-tailed)"), - bst->p == 0.5 ? 2: 1); - - tab_vline (table, TAL_2, 2, 0, tab_nr (table) -1); - free (cat1); - free (cat2); - - tab_submit (table); - + free (cat2); }