X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fnpar-summary.c;h=e45879565bee88d38cffb18fa25f990f48a87e86;hb=06ac0c2d623e9ae54c3e22a2d6740219ab357b21;hp=349fcc1e3c7c995d71934cbf2ffd02c0ac0b9e0c;hpb=d7d263511bd18042408c40d5536c20c59988ee15;p=pspp diff --git a/src/language/stats/npar-summary.c b/src/language/stats/npar-summary.c index 349fcc1e3c..e45879565b 100644 --- a/src/language/stats/npar-summary.c +++ b/src/language/stats/npar-summary.c @@ -1,170 +1,133 @@ -/* PSPP - computes sample statistics. - Copyright (C) 2006 Free Software Foundation, Inc. +/* PSPP - a program for statistical analysis. + 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include -#include -#include -#include -#include "npar-summary.h" -#include -#include -#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) void npar_summary_calc_descriptives (struct descriptives *desc, - const struct casefile *cf, - struct casefilter *filter, + struct casereader *input, const struct dictionary *dict, - const struct variable *const *vv, - int n_vars UNUSED) + const struct variable *const *vv, + int n_vars, + enum mv_class filter) { int i = 0; - while (*vv) + for (i = 0 ; i < n_vars; ++i) { - bool warn = true; double minimum = DBL_MAX; double maximum = -DBL_MAX; double var; struct moments1 *moments = moments1_create (MOMENT_VARIANCE); - struct casereader *r = casefile_get_reader (cf, filter); - struct ccase c; - const struct variable *v = *vv++; - - while (casereader_read(r, &c)) + struct ccase *c; + const struct variable *v = vv[i]; + struct casereader *pass; + + pass = casereader_clone (input); + pass = casereader_create_filter_missing (pass, + &v, 1, + filter, NULL, NULL); + pass = casereader_create_filter_weight (pass, dict, NULL, NULL); + while ((c = casereader_read (pass)) != NULL) { - const union value *val = case_data (&c, v); - double w = dict_get_case_weight (dict, &c, &warn); - - if ( ! casefilter_variable_missing (filter, &c, v )) - { - minimum = MIN (minimum, val->f); - maximum = MAX (maximum, val->f); - moments1_add (moments, val->f, w); - } - case_destroy (&c); + double val = case_num (c, v); + double w = dict_get_case_weight (dict, c, NULL); + minimum = MIN (minimum, val); + maximum = MAX (maximum, val); + moments1_add (moments, val, w); + case_unref (c); } - casereader_destroy (r); + casereader_destroy (pass); - moments1_calculate (moments, - &desc[i].n, - &desc[i].mean, + moments1_calculate (moments, + &desc[i].n, + &desc[i].mean, &var, NULL, NULL); desc[i].std_dev = sqrt (var); moments1_destroy (moments); - + desc[i].min = minimum; desc[i].max = maximum; - - i++; } + + casereader_destroy (input); } void -do_summary_box (const struct descriptives *desc, +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) + return; - if ( desc ) columns += 5; - if ( quartiles ) columns += 3; + struct pivot_table *table = pivot_table_create ( + N_("Descriptive Statistics")); + pivot_table_set_weight_format (table, wfmt); - table = tab_create (columns, 2 + n_vars, 0); + 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_dim (table, tab_natural_dimensions); + struct pivot_dimension *variables = pivot_dimension_create ( + table, PIVOT_AXIS_ROW, N_("Variable")); - tab_title (table, _("Descriptive Statistics")); - - tab_headers (table, 1, 0, 1, 0); - - tab_box (table, TAL_1, TAL_1, -1, TAL_1, - 0, 0, table->nc - 1, tab_nr(table) - 1 ); - - tab_hline (table, TAL_2, 0, tab_nc (table) -1, 2); - tab_vline (table, TAL_2, 1, 0, tab_nr (table) - 1); - - col = 1; - if ( desc ) + for (int v = 0; v < n_vars; ++v) { - 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++; - } + const struct variable *var = vv[v]; - 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++; - } + int row = pivot_category_create_leaf (variables->root, + pivot_value_new_variable (var)); - for ( v = 0 ; v < n_vars ; ++v ) - { - tab_text (table, 0, 2 + v, TAT_NONE, var_to_string (vv[v])); + 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])); - tab_float (table, 1, 2 + v, TAT_NONE, desc[v].n, 8, 0); - tab_float (table, 2, 2 + v, TAT_NONE, desc[v].mean, 8, 3); - tab_float (table, 3, 2 + v, TAT_NONE, desc[v].std_dev, 8, 3); - tab_float (table, 4, 2 + v, TAT_NONE, desc[v].min, 8, 3); - tab_float (table, 5, 2 + v, TAT_NONE, desc[v].max, 8, 3); + 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); }