X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fsign.c;h=45973262d986cdf3eb28a0c2651dc532c864f317;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=d5970c6ff0a61297803374c92755762cdca1f6d0;hpb=8b71948cd57dbd2787cb4c50525b957e9be8a62b;p=pspp-builds.git diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c index d5970c6f..45973262 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, 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,22 +15,24 @@ 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/dictionary.h" +#include "data/format.h" +#include "data/missing-values.h" +#include "data/procedure.h" +#include "data/variable.h" +#include "language/stats/npar.h" +#include "libpspp/str.h" +#include "output/tab.h" + +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -57,8 +59,6 @@ output_frequency_table (const struct two_sample_test *t2s, 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, NULL); - tab_title (table, _("Frequencies")); tab_headers (table, 2, 0, 1, 0); @@ -82,6 +82,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); @@ -110,8 +111,6 @@ output_statistics_table (const struct two_sample_test *t2s, int i; struct tab_table *table = tab_create (1 + t2s->n_pairs, 4); - tab_dim (table, tab_natural_dimensions, NULL, NULL); - tab_title (table, _("Test Statistics")); tab_headers (table, 0, 1, 0, 1); @@ -172,7 +171,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);