X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fnpar-summary.c;h=e45879565bee88d38cffb18fa25f990f48a87e86;hb=5327d77be2296f6be3f532c20456eab839dc7c62;hp=90a1b656106d8544ac77ceacb9cb4d972ea5a824;hpb=ab249f50e9f994b9a92a74b148f596f47fee0de9;p=pspp diff --git a/src/language/stats/npar-summary.c b/src/language/stats/npar-summary.c index 90a1b65610..e45879565b 100644 --- a/src/language/stats/npar-summary.c +++ b/src/language/stats/npar-summary.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,19 +16,22 @@ #include -#include -#include -#include -#include -#include -#include "npar-summary.h" -#include -#include -#include +#include "language/stats/npar-summary.h" + #include -#include + +#include "data/case.h" +#include "data/casereader.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/variable.h" +#include "math/moments.h" +#include "output/pivot-table.h" + +#include "gl/minmax.h" #include "gettext.h" +#define N_(msgid) msgid #define _(msgid) gettext (msgid) @@ -37,18 +40,18 @@ npar_summary_calc_descriptives (struct descriptives *desc, struct casereader *input, const struct dictionary *dict, const struct variable *const *vv, - int n_vars UNUSED, + int n_vars, enum mv_class filter) { int i = 0; - while (*vv) + for (i = 0 ; i < n_vars; ++i) { double minimum = DBL_MAX; double maximum = -DBL_MAX; double var; struct moments1 *moments = moments1_create (MOMENT_VARIANCE); struct ccase *c; - const struct variable *v = *vv++; + const struct variable *v = vv[i]; struct casereader *pass; pass = casereader_clone (input); @@ -79,9 +82,8 @@ npar_summary_calc_descriptives (struct descriptives *desc, desc[i].min = minimum; desc[i].max = maximum; - - i++; } + casereader_destroy (input); } @@ -90,84 +92,42 @@ npar_summary_calc_descriptives (struct descriptives *desc, void do_summary_box (const struct descriptives *desc, const struct variable *const *vv, - int n_vars) + int n_vars, + const struct fmt_spec *wfmt) { - int v; - bool quartiles = false; - - int col; - int columns = 1 ; - struct tab_table *table ; - - if ( desc ) columns += 5; - if ( quartiles ) columns += 3; - - table = tab_create (columns, 2 + n_vars, 0); - - tab_dim (table, tab_natural_dimensions, NULL, NULL); - - tab_title (table, _("Descriptive Statistics")); + if (!desc) + return; - tab_headers (table, 1, 0, 1, 0); + struct pivot_table *table = pivot_table_create ( + N_("Descriptive Statistics")); + pivot_table_set_weight_format (table, wfmt); - tab_box (table, TAL_1, TAL_1, -1, TAL_1, - 0, 0, table->nc - 1, tab_nr(table) - 1 ); + pivot_dimension_create ( + table, PIVOT_AXIS_COLUMN, N_("Statistics"), + N_("N"), PIVOT_RC_COUNT, + N_("Mean"), PIVOT_RC_OTHER, + N_("Std. Deviation"), PIVOT_RC_OTHER, + N_("Minimum"), N_("Maximum")); - tab_hline (table, TAL_2, 0, tab_nc (table) -1, 2); - tab_vline (table, TAL_2, 1, 0, tab_nr (table) - 1); + struct pivot_dimension *variables = pivot_dimension_create ( + table, PIVOT_AXIS_ROW, N_("Variable")); - col = 1; - if ( desc ) - { - tab_joint_text (table, col, 0, col, 1, TAT_TITLE | TAB_CENTER, - _("N")); - col++; - tab_joint_text (table, col, 0, col, 1, TAT_TITLE | TAB_CENTER, - _("Mean")); - col++; - tab_joint_text (table, col, 0, col, 1, TAT_TITLE | TAB_CENTER, - _("Std. Deviation")); - col++; - tab_joint_text (table, col, 0, col, 1, TAT_TITLE | TAB_CENTER, - _("Minimum")); - col++; - tab_joint_text (table, col, 0, col, 1, TAT_TITLE | TAB_CENTER, - _("Maximum")); - col++; - } - - if ( quartiles ) - { - tab_joint_text (table, col, 0, col + 2, 0, TAT_TITLE | TAB_CENTER, - _("Percentiles")); - tab_hline (table, TAL_1, col, col + 2, 1); - - tab_text (table, col, 1, TAT_TITLE | TAB_CENTER, - _("25th")); - col++; - tab_text (table, col, 1, TAT_TITLE | TAB_CENTER, - _("50th (Median)")); - col++; - tab_text (table, col, 1, TAT_TITLE | TAB_CENTER, - _("75th")); - col++; - } - - - for ( v = 0 ; v < n_vars ; ++v ) + for (int v = 0; v < n_vars; ++v) { const struct variable *var = vv[v]; - const struct fmt_spec *fmt = var_get_print_format (var); - tab_text (table, 0, 2 + v, TAT_NONE, var_to_string (var)); + int row = pivot_category_create_leaf (variables->root, + pivot_value_new_variable (var)); - tab_double (table, 1, 2 + v, TAT_NONE, desc[v].n, fmt); - tab_double (table, 2, 2 + v, TAT_NONE, desc[v].mean, fmt); - tab_double (table, 3, 2 + v, TAT_NONE, desc[v].std_dev, fmt); - tab_double (table, 4, 2 + v, TAT_NONE, desc[v].min, fmt); - tab_double (table, 5, 2 + v, TAT_NONE, desc[v].max, fmt); - } + double entries[] = { desc[v].n, desc[v].mean, desc[v].std_dev }; + for (size_t j = 0; j < sizeof entries / sizeof *entries; j++) + pivot_table_put2 (table, j, row, pivot_value_new_number (entries[j])); + union value extrema[2] = { { .f = desc[v].min }, { .f = desc[v].max } }; + for (size_t j = 0; j < 2; j++) + pivot_table_put2 (table, 3 + j, row, + pivot_value_new_var_value (var, &extrema[j])); + } - tab_submit (table); + pivot_table_submit (table); }