X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fsign.c;h=32a74b20e07cc60004ac55923718181cace2eee6;hb=f4491cda2715c59495d963d0a3d8ae4518c1c13d;hp=a5a272126007c557a2c006b652d73cf7e9fe4436;hpb=5c3291dc396b795696e94f47780308fd7ace6fc4;p=pspp diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c index a5a2721260..32a74b20e0 100644 --- a/src/language/stats/sign.c +++ b/src/language/stats/sign.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -15,24 +15,27 @@ along with this program. If not, see . */ #include -#include "sign.h" -#include -#include -#include +#include "language/stats/sign.h" + #include #include -#include "npar.h" -#include -#include -#include -#include -#include -#include "minmax.h" -#include "xalloc.h" +#include "data/casereader.h" +#include "data/dataset.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/missing-values.h" +#include "data/variable.h" +#include "language/stats/npar.h" +#include "libpspp/str.h" +#include "output/pivot-table.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" +#define N_(msgid) msgid #define _(msgid) gettext (msgid) struct sign_test_params @@ -45,120 +48,80 @@ struct sign_test_params double point_prob; }; +static int +add_pair_leaf (struct pivot_dimension *dimension, variable_pair *pair) +{ + char *label = xasprintf ("%s - %s", var_to_string ((*pair)[0]), + var_to_string ((*pair)[1])); + return pivot_category_create_leaf ( + dimension->root, + pivot_value_new_user_text_nocopy (label)); +} static void output_frequency_table (const struct two_sample_test *t2s, const struct sign_test_params *param, const struct dictionary *dict) { - int i; - struct tab_table *table = tab_create (3, 1 + 4 * t2s->n_pairs, 0); - - const struct variable *wv = dict_get_weight (dict); - const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : & F_8_0; - - tab_dim (table, tab_natural_dimensions, NULL); - - tab_title (table, _("Frequencies")); + struct pivot_table *table = pivot_table_create (N_("Frequencies")); + pivot_table_set_weight_var (table, dict_get_weight (dict)); - tab_headers (table, 2, 0, 1, 0); + pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("N"), + N_("N"), PIVOT_RC_COUNT); - /* Vertical lines inside the box */ - tab_box (table, 0, 0, -1, TAL_1, - 1, 0, table->nc - 1, tab_nr (table) - 1 ); + pivot_dimension_create (table, PIVOT_AXIS_ROW, N_("Differences"), + N_("Negative Differences"), + N_("Positive Differences"), + N_("Ties"), N_("Total")); - /* Box around entire table */ - tab_box (table, TAL_2, TAL_2, -1, -1, - 0, 0, table->nc - 1, tab_nr (table) - 1 ); + struct pivot_dimension *pairs = pivot_dimension_create ( + table, PIVOT_AXIS_ROW, N_("Pairs")); - tab_text (table, 2, 0, TAB_CENTER, _("N")); - - for (i = 0 ; i < t2s->n_pairs; ++i) + for (size_t i = 0 ; i < t2s->n_pairs; ++i) { variable_pair *vp = &t2s->pairs[i]; - struct string pair_name; - ds_init_cstr (&pair_name, var_to_string ((*vp)[0])); - 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); + int pair_idx = add_pair_leaf (pairs, vp); - tab_hline (table, TAL_1, 0, table->nc - 1, 1 + i * 4); - - tab_text (table, 1, 1 + i * 4, TAB_LEFT, _("Negative Differences")); - tab_text (table, 1, 2 + i * 4, TAB_LEFT, _("Positive Differences")); - tab_text (table, 1, 3 + i * 4, TAB_LEFT, _("Ties")); - tab_text (table, 1, 4 + i * 4, TAB_LEFT, _("Total")); - - tab_double (table, 2, 1 + i * 4, TAB_RIGHT, param[i].neg, wfmt); - tab_double (table, 2, 2 + i * 4, TAB_RIGHT, param[i].pos, wfmt); - tab_double (table, 2, 3 + i * 4, TAB_RIGHT, param[i].ties, wfmt); - tab_double (table, 2, 4 + i * 4, TAB_RIGHT, - param[i].ties + param[i].neg + param[i].pos, wfmt); + const struct sign_test_params *p = ¶m[i]; + double values[] = { p->neg, p->pos, p->ties, p->ties + p->neg + p->pos }; + for (size_t j = 0; j < sizeof values / sizeof *values; j++) + pivot_table_put3 (table, 0, j, pair_idx, + pivot_value_new_number (values[j])); } - tab_submit (table); + pivot_table_submit (table); } static void output_statistics_table (const struct two_sample_test *t2s, const struct sign_test_params *param) { - int i; - struct tab_table *table = tab_create (1 + t2s->n_pairs, 4, 0); + struct pivot_table *table = pivot_table_create (N_("Test Statistics")); - tab_dim (table, tab_natural_dimensions, NULL); + pivot_dimension_create (table, PIVOT_AXIS_ROW, N_("Statistics"), + N_("Exact Sig. (2-tailed)"), PIVOT_RC_SIGNIFICANCE, + N_("Exact Sig. (1-tailed)"), PIVOT_RC_SIGNIFICANCE, + N_("Point Probability"), PIVOT_RC_SIGNIFICANCE); - tab_title (table, _("Test Statistics")); + struct pivot_dimension *pairs = pivot_dimension_create ( + table, PIVOT_AXIS_COLUMN, N_("Pairs")); - tab_headers (table, 0, 1, 0, 1); - - tab_hline (table, TAL_2, 0, table->nc - 1, 1); - tab_vline (table, TAL_2, 1, 0, table->nr - 1); - - - /* Vertical lines inside the box */ - tab_box (table, -1, -1, -1, TAL_1, - 0, 0, - table->nc - 1, tab_nr (table) - 1); - - /* Box around entire table */ - tab_box (table, TAL_2, TAL_2, -1, -1, - 0, 0, table->nc - 1, - tab_nr (table) - 1); - - tab_text (table, 0, 1, TAT_TITLE | TAB_LEFT, - _("Exact Sig. (2-tailed)")); - - tab_text (table, 0, 2, TAT_TITLE | TAB_LEFT, - _("Exact Sig. (1-tailed)")); - - tab_text (table, 0, 3, TAT_TITLE | TAB_LEFT, - _("Point Probability")); - - for (i = 0 ; i < t2s->n_pairs; ++i) + for (size_t i = 0 ; i < t2s->n_pairs; ++i) { variable_pair *vp = &t2s->pairs[i]; - - struct string pair_name; - ds_init_cstr (&pair_name, var_to_string ((*vp)[0])); - ds_put_cstr (&pair_name, " - "); - ds_put_cstr (&pair_name, var_to_string ((*vp)[1])); - - tab_text (table, 1 + i, 0, TAB_LEFT, ds_cstr (&pair_name)); - ds_destroy (&pair_name); - - tab_double (table, 1 + i, 1, TAB_RIGHT, - param[i].one_tailed_sig * 2, NULL); - - tab_double (table, 1 + i, 2, TAB_RIGHT, param[i].one_tailed_sig, NULL); - tab_double (table, 1 + i, 3, TAB_RIGHT, param[i].point_prob, NULL); + int pair_idx = add_pair_leaf (pairs, vp); + + const struct sign_test_params *p = ¶m[i]; + double values[] = { p->one_tailed_sig * 2, + p->one_tailed_sig, + p->point_prob }; + for (size_t j = 0; j < sizeof values / sizeof *values; j++) + pivot_table_put2 (table, j, pair_idx, + pivot_value_new_number (values[j])); } - tab_submit (table); + pivot_table_submit (table); } void @@ -172,10 +135,10 @@ 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); + struct sign_test_params *stp = XCALLOC (t2s->n_pairs, struct sign_test_params); struct casereader *r = input; @@ -183,20 +146,20 @@ sign_execute (const struct dataset *ds, { const double weight = dict_get_case_weight (dict, c, &warn); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { variable_pair *vp = &t2s->pairs[i]; const union value *value0 = case_data (c, (*vp)[0]); const union value *value1 = case_data (c, (*vp)[1]); const double diff = value0->f - value1->f; - if (var_is_value_missing ((*vp)[0], value0, exclude)) + if (var_is_value_missing ((*vp)[0], value0) & exclude) continue; - if (var_is_value_missing ((*vp)[1], value1, exclude)) + if (var_is_value_missing ((*vp)[1], value1) & exclude) continue; - if ( diff > 0) + if (diff > 0) stp[i].pos += weight; else if (diff < 0) stp[i].neg += weight; @@ -207,7 +170,7 @@ sign_execute (const struct dataset *ds, casereader_destroy (r); - for (i = 0 ; i < t2s->n_pairs; ++i ) + for (i = 0 ; i < t2s->n_pairs; ++i) { int r = MIN (stp[i].pos, stp[i].neg); stp[i].one_tailed_sig = gsl_cdf_binomial_P (r,