X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffrequencies.c;h=e5462d083d2fd44d6e24e2e23960d360c6ad8f6f;hb=339f1956cc72;hp=305d4f1d75f4d2d4ff68a81ede9acd7a8e2fa2ff;hpb=52e144652645cab108fb2db0a970f1ace2cbf2ea;p=pspp diff --git a/src/language/stats/frequencies.c b/src/language/stats/frequencies.c index 305d4f1d75..e5462d083d 100644 --- a/src/language/stats/frequencies.c +++ b/src/language/stats/frequencies.c @@ -1,7 +1,7 @@ /* PSPP - a program for statistical analysis. Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2014, 2015 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 3 of the License, or @@ -11,7 +11,7 @@ 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, see . */ @@ -52,11 +52,10 @@ #include "math/chart-geometry.h" -#include "output/chart-item.h" #include "output/charts/barchart.h" #include "output/charts/piechart.h" #include "output/charts/plot-hist.h" -#include "output/tab.h" +#include "output/pivot-table.h" #include "gl/minmax.h" #include "gl/xalloc.h" @@ -107,7 +106,7 @@ enum FRQ_PERCENT }; -enum sortprops +enum sortprops { FRQ_AFREQ, FRQ_DFREQ, @@ -211,7 +210,8 @@ struct frq_proc /* Percentiles to calculate and possibly display. */ struct percentile *percentiles; - int n_percentiles, n_show_percentiles; + const struct percentile *median; + int n_percentiles; /* Frequency table display. */ long int max_categories; /* Maximum categories to show. */ @@ -224,6 +224,8 @@ struct frq_proc /* Histogram and pie chart settings. */ struct frq_chart *hist, *pie, *bar; + + bool warn; }; @@ -236,9 +238,10 @@ struct freq_compare_aux bool ascending_value; }; -static void calc_stats (const struct var_freqs *vf, double d[FRQ_ST_count]); +static void calc_stats (const struct frq_proc *, + const struct var_freqs *, double d[FRQ_ST_count]); -static void do_piechart(const struct frq_chart *pie, +static void do_piechart(const struct frq_chart *pie, const struct variable *var, const struct freq_tab *frq_tab); @@ -246,8 +249,7 @@ static void do_barchart(const struct frq_chart *bar, const struct variable **var, const struct freq_tab *frq_tab); -static void dump_statistics (const struct frq_proc *frq, - const struct var_freqs *vf, +static void dump_statistics (const struct frq_proc *frq, const struct variable *wv); static int @@ -274,89 +276,74 @@ static struct histogram * freq_tab_to_hist (const struct frq_proc *frq, const struct freq_tab *ft, const struct variable *var); +static void +put_freq_row (struct pivot_table *table, int var_idx, + double frequency, double percent, + double valid_percent, double cum_percent) +{ + double entries[] = { frequency, percent, valid_percent, cum_percent }; + for (size_t i = 0; i < sizeof entries / sizeof *entries; i++) + if (entries[i] != SYSMIS) + pivot_table_put2 (table, i, var_idx, + pivot_value_new_number (entries[i])); +} /* Displays a full frequency table for variable V. */ static void dump_freq_table (const struct var_freqs *vf, const struct variable *wv) { - const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0; const struct freq_tab *ft = &vf->tab; - int n_categories; - struct freq *f; - struct tab_table *t; - int r, x; - double cum_total = 0.0; - double cum_freq = 0.0; - static const char *headings[] = { - N_("Value Label"), - N_("Value"), - N_("Frequency"), - N_("Percent"), - N_("Valid Percent"), - N_("Cum Percent") - }; + struct pivot_table *table = pivot_table_create__ (pivot_value_new_variable ( + vf->var), "Frequencies"); + pivot_table_set_weight_var (table, wv); - n_categories = ft->n_valid + ft->n_missing; - t = tab_create (6, n_categories + 2); - tab_set_format (t, RC_WEIGHT, wfmt); - tab_headers (t, 0, 0, 1, 0); + pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Statistics"), + N_("Frequency"), PIVOT_RC_COUNT, + N_("Percent"), PIVOT_RC_PERCENT, + N_("Valid Percent"), PIVOT_RC_PERCENT, + N_("Cumulative Percent"), PIVOT_RC_PERCENT); - for (x = 0; x < 6; x++) - tab_text (t, x, 0, TAB_CENTER | TAT_TITLE, gettext (headings[x])); + struct pivot_dimension *variable = pivot_dimension_create__ ( + table, PIVOT_AXIS_ROW, pivot_value_new_variable (vf->var)); - r = 1; - for (f = ft->valid; f < ft->missing; f++) + double cum_freq = 0.0; + double cum_percent = 0.0; + struct pivot_category *valid = NULL; + for (const struct freq *f = ft->valid; f < ft->missing; f++) { - const char *label; - double percent, valid_percent; - cum_freq += f->count; - - percent = f->count / ft->total_cases * 100.0; - valid_percent = f->count / ft->valid_cases * 100.0; - cum_total += valid_percent; - - label = var_lookup_value_label (vf->var, f->values); - if (label != NULL) - tab_text (t, 0, r, TAB_LEFT, label); - - tab_value (t, 1, r, TAB_NONE, f->values, vf->var, NULL); - tab_double (t, 2, r, TAB_NONE, f->count, NULL, RC_WEIGHT); - tab_double (t, 3, r, TAB_NONE, percent, NULL, RC_OTHER); - tab_double (t, 4, r, TAB_NONE, valid_percent, NULL, RC_OTHER); - tab_double (t, 5, r, TAB_NONE, cum_total, NULL, RC_OTHER); - r++; + double valid_percent = f->count / ft->valid_cases * 100.0; + cum_percent += valid_percent; + + if (!valid) + valid = pivot_category_create_group (variable->root, N_("Valid")); + int var_idx = pivot_category_create_leaf ( + valid, pivot_value_new_var_value (vf->var, &f->values[0])); + put_freq_row (table, var_idx, f->count, + f->count / ft->total_cases * 100.0, + valid_percent, cum_percent); } - for (; f < &ft->valid[n_categories]; f++) - { - const char *label; + struct pivot_category *missing = NULL; + size_t n_categories = ft->n_valid + ft->n_missing; + for (const struct freq *f = ft->missing; f < &ft->valid[n_categories]; f++) + { cum_freq += f->count; - label = var_lookup_value_label (vf->var, f->values); - if (label != NULL) - tab_text (t, 0, r, TAB_LEFT, label); - - tab_value (t, 1, r, TAB_NONE, f->values, vf->var, NULL); - tab_double (t, 2, r, TAB_NONE, f->count, NULL, RC_WEIGHT); - tab_double (t, 3, r, TAB_NONE, - f->count / ft->total_cases * 100.0, NULL, RC_OTHER); - tab_text (t, 4, r, TAB_NONE, _("Missing")); - r++; + if (!missing) + missing = pivot_category_create_group (variable->root, N_("Missing")); + int var_idx = pivot_category_create_leaf ( + missing, pivot_value_new_var_value (vf->var, &f->values[0])); + put_freq_row (table, var_idx, f->count, + f->count / ft->total_cases * 100.0, SYSMIS, SYSMIS); } - tab_box (t, TAL_1, TAL_1, -1, TAL_1, 0, 0, 5, r); - tab_hline (t, TAL_2, 0, 5, 1); - tab_hline (t, TAL_2, 0, 5, r); - tab_joint_text (t, 0, r, 1, r, TAB_RIGHT | TAT_TITLE, _("Total")); - tab_vline (t, TAL_0, 1, r, r); - tab_double (t, 2, r, TAB_NONE, cum_freq, NULL, RC_WEIGHT); - tab_double (t, 3, r, TAB_NONE, 100.0, &F_5_1, RC_OTHER); - tab_double (t, 4, r, TAB_NONE, 100.0, &F_5_1, RC_OTHER); - - tab_title (t, "%s", var_to_string (vf->var)); - tab_submit (t); + int var_idx = pivot_category_create_leaf ( + variable->root, pivot_value_new_text (N_("Total"))); + put_freq_row (table, var_idx, cum_freq, cum_percent, SYSMIS, SYSMIS); + + pivot_table_submit (table); } /* Statistical display. */ @@ -407,7 +394,9 @@ calc_percentiles (const struct frq_proc *frq, const struct var_freqs *vf) for (; percentile_idx < frq->n_percentiles; percentile_idx++) { struct percentile *pc = &frq->percentiles[percentile_idx]; - pc->value = ft->valid[ft->n_valid - 1].values[0].f; + pc->value = (ft->n_valid > 0 + ? ft->valid[ft->n_valid - 1].values[0].f + : SYSMIS); } } @@ -453,7 +442,7 @@ postprocess_freq_tab (const struct frq_proc *frq, struct var_freqs *vf) /* Summary statistics. */ ft->valid_cases = 0.0; - for(i = 0 ; i < ft->n_valid ; ++i ) + for(i = 0 ; i < ft->n_valid ; ++i) { f = &ft->valid[i]; ft->valid_cases += f->count; @@ -461,7 +450,7 @@ postprocess_freq_tab (const struct frq_proc *frq, struct var_freqs *vf) } ft->total_cases = ft->valid_cases ; - for(i = 0 ; i < ft->n_missing ; ++i ) + for(i = 0 ; i < ft->n_missing ; ++i) { f = &ft->missing[i]; ft->total_cases += f->count; @@ -481,7 +470,7 @@ cleanup_freq_tab (struct var_freqs *vf) static void calc (struct frq_proc *frq, const struct ccase *c, const struct dataset *ds) { - double weight = dict_get_case_weight (dataset_dict (ds), c, NULL); + double weight = dict_get_case_weight (dataset_dict (ds), c, &frq->warn); size_t i; for (i = 0; i < frq->n_vars; i++) @@ -530,36 +519,39 @@ postcalc (struct frq_proc *frq, const struct dataset *ds) for (i = 0; i < frq->n_vars; i++) { struct var_freqs *vf = &frq->vars[i]; - postprocess_freq_tab (frq, vf); + calc_percentiles (frq, vf); + } + + if (frq->n_stats) + dump_statistics (frq, wv); + + for (i = 0; i < frq->n_vars; i++) + { + struct var_freqs *vf = &frq->vars[i]; /* Frequencies tables. */ if (vf->tab.n_valid + vf->tab.n_missing <= frq->max_categories) dump_freq_table (vf, wv); - calc_percentiles (frq, vf); - - /* Statistics. */ - if (frq->n_stats) - dump_statistics (frq, vf, wv); if (frq->hist && var_is_numeric (vf->var) && vf->tab.n_valid > 0) { double d[FRQ_ST_count]; struct histogram *histogram; - calc_stats (vf, d); + calc_stats (frq, vf, d); histogram = freq_tab_to_hist (frq, &vf->tab, vf->var); - if ( histogram) + if (histogram) { - chart_item_submit (histogram_chart_create ( - histogram->gsl_hist, var_to_string(vf->var), - vf->tab.valid_cases, - d[FRQ_ST_MEAN], - d[FRQ_ST_STDDEV], - frq->hist->draw_normal)); + chart_submit (histogram_chart_create ( + histogram->gsl_hist, var_to_string(vf->var), + vf->tab.valid_cases, + d[FRQ_ST_MEAN], + d[FRQ_ST_STDDEV], + frq->hist->draw_normal)); statistic_destroy (&histogram->parent); } @@ -606,9 +598,9 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) frq.vars = NULL; frq.n_vars = 0; - - frq.stats = BIT_INDEX (FRQ_ST_MEAN) - | BIT_INDEX (FRQ_ST_STDDEV) + + frq.stats = BIT_INDEX (FRQ_ST_MEAN) + | BIT_INDEX (FRQ_ST_STDDEV) | BIT_INDEX (FRQ_ST_MINIMUM) | BIT_INDEX (FRQ_ST_MAXIMUM); @@ -618,18 +610,18 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) frq.percentiles = NULL; frq.n_percentiles = 0; - frq.n_show_percentiles = 0; frq.hist = NULL; frq.pie = NULL; frq.bar = NULL; + frq.warn = true; /* Accept an optional, completely pointless "/VARIABLES=" */ lex_match (lexer, T_SLASH); if (lex_match_id (lexer, "VARIABLES")) { - if (! lex_force_match (lexer, T_EQUALS) ) + if (! lex_force_match (lexer, T_EQUALS)) goto error; } @@ -639,7 +631,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) PV_NO_DUPLICATE)) goto error; - frq.vars = xzalloc (frq.n_vars * sizeof (*frq.vars)); + frq.vars = xcalloc (frq.n_vars, sizeof (*frq.vars)); for (i = 0; i < frq.n_vars; ++i) { frq.vars[i].var = vars[i]; @@ -652,11 +644,11 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, "STATISTICS")) { - frq.stats = BIT_INDEX (FRQ_ST_MEAN) - | BIT_INDEX (FRQ_ST_STDDEV) + frq.stats = BIT_INDEX (FRQ_ST_MEAN) + | BIT_INDEX (FRQ_ST_STDDEV) | BIT_INDEX (FRQ_ST_MINIMUM) | BIT_INDEX (FRQ_ST_MAXIMUM); - + frq.n_stats = 4; if (lex_match (lexer, T_EQUALS)) @@ -670,8 +662,8 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) { if (lex_match_id (lexer, "DEFAULT")) { - frq.stats = BIT_INDEX (FRQ_ST_MEAN) - | BIT_INDEX (FRQ_ST_STDDEV) + frq.stats = BIT_INDEX (FRQ_ST_MEAN) + | BIT_INDEX (FRQ_ST_STDDEV) | BIT_INDEX (FRQ_ST_MINIMUM) | BIT_INDEX (FRQ_ST_MAXIMUM); @@ -773,14 +765,13 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) if (lex_force_num (lexer)) { frq.percentiles = - xrealloc (frq.percentiles, + xrealloc (frq.percentiles, (frq.n_percentiles + 1) * sizeof (*frq.percentiles)); frq.percentiles[frq.n_percentiles].p = lex_number (lexer) / 100.0; frq.percentiles[frq.n_percentiles].show = true; lex_get (lexer); frq.n_percentiles++; - frq.n_show_percentiles++; } else { @@ -806,7 +797,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "LIMIT")) { if (!lex_force_match (lexer, T_LPAREN) - || !lex_force_int (lexer)) + || !lex_force_int_range (lexer, "LIMIT", 0, INT_MAX)) goto error; frq.max_categories = lex_integer (lexer); @@ -842,15 +833,14 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) { lex_match (lexer, T_EQUALS); - if (lex_force_int (lexer)) + if (lex_force_int_range (lexer, "NTILES", 0, INT_MAX)) { - int i; int n = lex_integer (lexer); lex_get (lexer); - for (i = 0; i < n + 1; ++i) + for (int i = 0; i < n + 1; ++i) { frq.percentiles = - xrealloc (frq.percentiles, + xrealloc (frq.percentiles, (frq.n_percentiles + 1) * sizeof (*frq.percentiles)); frq.percentiles[frq.n_percentiles].p = @@ -858,7 +848,6 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) frq.percentiles[frq.n_percentiles].show = true; frq.n_percentiles++; - frq.n_show_percentiles++; } } else @@ -906,13 +895,9 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) hi_scale = FRQ_FREQ; if (lex_match (lexer, T_LPAREN)) { - if (lex_force_int (lexer)) + if (lex_force_int_range (lexer, "FREQ", 1, INT_MAX)) { hi_freq = lex_integer (lexer); - if (hi_freq <= 0) - { - lex_error (lexer, _("Histogram frequency must be greater than zero.")); - } lex_get (lexer); if (! lex_force_match (lexer, T_RPAREN)) goto error; @@ -924,13 +909,9 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) hi_scale = FRQ_PERCENT; if (lex_match (lexer, T_LPAREN)) { - if (lex_force_int (lexer)) + if (lex_force_int_range (lexer, "PERCENT", 1, INT_MAX)) { hi_pcnt = lex_integer (lexer); - if (hi_pcnt <= 0) - { - lex_error (lexer, _("Histogram percentage must be greater than zero.")); - } lex_get (lexer); if (! lex_force_match (lexer, T_RPAREN)) goto error; @@ -1046,7 +1027,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "FREQ")) { - if ( lex_match (lexer, T_LPAREN)) + if (lex_match (lexer, T_LPAREN)) { if (lex_force_num (lexer)) { @@ -1060,7 +1041,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) } else if (lex_match_id (lexer, "PERCENT")) { - if ( lex_match (lexer, T_LPAREN)) + if (lex_match (lexer, T_LPAREN)) { if (lex_force_num (lexer)) { @@ -1116,15 +1097,14 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) if (frq.stats & BIT_INDEX (FRQ_ST_MEDIAN)) { frq.percentiles = - xrealloc (frq.percentiles, + xrealloc (frq.percentiles, (frq.n_percentiles + 1) * sizeof (*frq.percentiles)); - + frq.percentiles[frq.n_percentiles].p = 0.50; - frq.percentiles[frq.n_percentiles].show = true; + frq.percentiles[frq.n_percentiles].show = false; frq.n_percentiles++; - frq.n_show_percentiles++; } @@ -1149,24 +1129,24 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) msg (SE, _("%s for histogram must be greater than or equal to %s, " "but %s was specified as %.15g and %s as %.15g. " "%s and %s will be ignored."), - "MAX", "MIN", - "MIN", hist->x_min, + "MAX", "MIN", + "MIN", hist->x_min, "MAX", hist->x_max, "MIN", "MAX"); hist->x_min = hist->x_max = SYSMIS; } frq.percentiles = - xrealloc (frq.percentiles, + xrealloc (frq.percentiles, (frq.n_percentiles + 2) * sizeof (*frq.percentiles)); - + frq.percentiles[frq.n_percentiles].p = 0.25; frq.percentiles[frq.n_percentiles].show = false; frq.percentiles[frq.n_percentiles + 1].p = 0.75; frq.percentiles[frq.n_percentiles + 1].show = false; - + frq.n_percentiles+=2; } @@ -1193,8 +1173,8 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) { msg (SE, _("%s for pie chart must be greater than or equal to %s, " "but %s was specified as %.15g and %s as %.15g. " - "%s and %s will be ignored."), - "MAX", "MIN", + "%s and %s will be ignored."), + "MAX", "MIN", "MIN", pie->x_min, "MAX", pie->x_max, "MIN", "MAX"); @@ -1207,30 +1187,34 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) int i,o; double previous_p = -1; qsort (frq.percentiles, frq.n_percentiles, - sizeof (*frq.percentiles), + sizeof (*frq.percentiles), ptile_3way); - frq.n_show_percentiles = 0; for (i = o = 0; i < frq.n_percentiles; ++i) { if (frq.percentiles[i].p != previous_p) { frq.percentiles[o].p = frq.percentiles[i].p; frq.percentiles[o].show = frq.percentiles[i].show; - if (frq.percentiles[i].show) - frq.n_show_percentiles++; o++; } else if (frq.percentiles[i].show && !frq.percentiles[o].show) { frq.percentiles[o].show = true; - frq.n_show_percentiles++; } previous_p = frq.percentiles[i].p; } frq.n_percentiles = o; + + frq.median = NULL; + for (i = 0; i < frq.n_percentiles; i++) + if (frq.percentiles[i].p == 0.5) + { + frq.median = &frq.percentiles[i]; + break; + } } { @@ -1357,7 +1341,7 @@ freq_tab_to_hist (const struct frq_proc *frq, const struct freq_tab *ft, histogram = histogram_create (bin_width, x_min, x_max); - if ( histogram == NULL) + if (histogram == NULL) return NULL; for (i = 0; i < ft->n_valid; i++) @@ -1384,7 +1368,7 @@ pick_cat_counts (const struct frq_chart *catchart, int n_slices = 0; int i; struct freq *slices = xnmalloc (frq_tab->n_valid + frq_tab->n_missing, sizeof *slices); - + for (i = 0; i < frq_tab->n_valid; i++) { const struct freq *f = &frq_tab->valid[i]; @@ -1393,9 +1377,9 @@ pick_cat_counts (const struct frq_chart *catchart, if (f->count < catchart->x_min) continue; - + slices[n_slices] = *f; - + n_slices++; } @@ -1405,11 +1389,11 @@ pick_cat_counts (const struct frq_chart *catchart, { const struct freq *f = &frq_tab->missing[i]; slices[n_slices].count += f->count; - + if (i == 0) slices[n_slices].values[0] = f->values[0]; } - + if (frq_tab->n_missing > 0) n_slices++; } @@ -1432,7 +1416,7 @@ pick_cat_counts_ptr (const struct frq_chart *catchart, int n_slices = 0; int i; struct freq **slices = xnmalloc (frq_tab->n_valid + frq_tab->n_missing, sizeof *slices); - + for (i = 0; i < frq_tab->n_valid; i++) { struct freq *f = &frq_tab->valid[i]; @@ -1441,9 +1425,9 @@ pick_cat_counts_ptr (const struct frq_chart *catchart, if (f->count < catchart->x_min) continue; - + slices[n_slices] = f; - + n_slices++; } @@ -1459,7 +1443,7 @@ pick_cat_counts_ptr (const struct frq_chart *catchart, } slices[n_slices]->count += f->count; - + } } @@ -1483,7 +1467,7 @@ do_piechart(const struct frq_chart *pie, const struct variable *var, msg (SW, _("Omitting pie chart for %s, which has over 50 unique values."), var_get_name (var)); else - chart_item_submit (piechart_create (var, slices, n_slices)); + chart_submit (piechart_create (var, slices, n_slices)); free (slices); } @@ -1496,10 +1480,13 @@ do_barchart(const struct frq_chart *bar, const struct variable **var, int n_slices; struct freq **slices = pick_cat_counts_ptr (bar, frq_tab, &n_slices); - chart_item_submit (barchart_create (var, 1, - (bar->y_scale == FRQ_FREQ) ? _("Count") : _("Percent"), - (bar->y_scale == FRQ_PERCENT), - slices, n_slices)); + if (n_slices < 1) + msg (SW, _("Omitting bar chart, which has no values.")); + else + chart_submit (barchart_create (var, 1, + (bar->y_scale == FRQ_FREQ) ? _("Count") : _("Percent"), + (bar->y_scale == FRQ_PERCENT), + slices, n_slices)); free (slices); } @@ -1507,7 +1494,8 @@ do_barchart(const struct frq_chart *bar, const struct variable **var, /* Calculates all the pertinent statistics for VF, putting them in array D[]. */ static void -calc_stats (const struct var_freqs *vf, double d[FRQ_ST_count]) +calc_stats (const struct frq_proc *frq, const struct var_freqs *vf, + double d[FRQ_ST_count]) { const struct freq_tab *ft = &vf->tab; double W = ft->valid_cases; @@ -1543,98 +1531,120 @@ calc_stats (const struct var_freqs *vf, double d[FRQ_ST_count]) moments_destroy (m); /* Formulae below are taken from _SPSS Statistical Algorithms_. */ - d[FRQ_ST_MINIMUM] = ft->valid[0].values[0].f; - d[FRQ_ST_MAXIMUM] = ft->valid[ft->n_valid - 1].values[0].f; + if (ft->n_valid > 0) + { + d[FRQ_ST_MINIMUM] = ft->valid[0].values[0].f; + d[FRQ_ST_MAXIMUM] = ft->valid[ft->n_valid - 1].values[0].f; + d[FRQ_ST_RANGE] = d[FRQ_ST_MAXIMUM] - d[FRQ_ST_MINIMUM]; + } + else + { + d[FRQ_ST_MINIMUM] = SYSMIS; + d[FRQ_ST_MAXIMUM] = SYSMIS; + d[FRQ_ST_RANGE] = SYSMIS; + } d[FRQ_ST_MODE] = X_mode; - d[FRQ_ST_RANGE] = d[FRQ_ST_MAXIMUM] - d[FRQ_ST_MINIMUM]; d[FRQ_ST_SUM] = d[FRQ_ST_MEAN] * W; d[FRQ_ST_STDDEV] = sqrt (d[FRQ_ST_VARIANCE]); d[FRQ_ST_SEMEAN] = d[FRQ_ST_STDDEV] / sqrt (W); d[FRQ_ST_SESKEWNESS] = calc_seskew (W); d[FRQ_ST_SEKURTOSIS] = calc_sekurt (W); + d[FRQ_ST_MEDIAN] = frq->median ? frq->median->value : SYSMIS; } -/* Displays a table of all the statistics requested for variable V. */ -static void -dump_statistics (const struct frq_proc *frq, const struct var_freqs *vf, - const struct variable *wv) +static bool +all_string_variables (const struct frq_proc *frq) { - const struct fmt_spec *wfmt = wv ? var_get_print_format (wv) : &F_8_0; - const struct freq_tab *ft = &vf->tab; - double stat_value[FRQ_ST_count]; - struct tab_table *t; - int i, r = 2; /* N missing and N valid are always dumped */ - - if (var_is_alpha (vf->var)) - return; + for (size_t i = 0; i < frq->n_vars; i++) + if (var_is_numeric (frq->vars[i].var)) + return false; - calc_stats (vf, stat_value); - - t = tab_create (3, ((frq->stats & BIT_INDEX (FRQ_ST_MEDIAN)) ? frq->n_stats - 1 : frq->n_stats) - + frq->n_show_percentiles + 2); - - tab_set_format (t, RC_WEIGHT, wfmt); - tab_box (t, TAL_1, TAL_1, -1, -1 , 0 , 0 , 2, tab_nr(t) - 1) ; + return true; +} - tab_vline (t, TAL_1 , 2, 0, tab_nr(t) - 1); - tab_vline (t, TAL_GAP , 1, 0, tab_nr(t) - 1 ) ; +/* Displays a table of all the statistics requested. */ +static void +dump_statistics (const struct frq_proc *frq, const struct variable *wv) +{ + if (all_string_variables (frq)) + return; - for (i = 0; i < FRQ_ST_count; i++) + struct pivot_table *table = pivot_table_create (N_("Statistics")); + pivot_table_set_weight_var (table, wv); + + struct pivot_dimension *variables + = pivot_dimension_create (table, PIVOT_AXIS_COLUMN, N_("Variables")); + + struct pivot_dimension *statistics = pivot_dimension_create ( + table, PIVOT_AXIS_ROW, N_("Statistics")); + struct pivot_category *n = pivot_category_create_group ( + statistics->root, N_("N")); + pivot_category_create_leaves (n, + N_("Valid"), PIVOT_RC_COUNT, + N_("Missing"), PIVOT_RC_COUNT); + for (int i = 0; i < FRQ_ST_count; i++) + if (frq->stats & BIT_INDEX (i)) + pivot_category_create_leaf (statistics->root, + pivot_value_new_text (st_name[i])); + struct pivot_category *percentiles = NULL; + for (size_t i = 0; i < frq->n_percentiles; i++) { - if (FRQ_ST_MEDIAN == i) - continue; - - if (frq->stats & BIT_INDEX (i)) - { - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, - gettext (st_name[i])); - - if (vf->tab.n_valid <= 0 && r >= 2) - tab_text (t, 2, r, 0, "."); - else - tab_double (t, 2, r, TAB_NONE, stat_value[i], NULL, RC_OTHER); - r++; - } - } + const struct percentile *pc = &frq->percentiles[i]; - tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("N")); - tab_text (t, 1, 0, TAB_LEFT | TAT_TITLE, _("Valid")); - tab_text (t, 1, 1, TAB_LEFT | TAT_TITLE, _("Missing")); + if (!pc->show) + continue; - tab_double (t, 2, 0, TAB_NONE, ft->valid_cases, NULL, RC_WEIGHT); - tab_double (t, 2, 1, TAB_NONE, ft->total_cases - ft->valid_cases, NULL, RC_WEIGHT); + if (!percentiles) + percentiles = pivot_category_create_group ( + statistics->root, N_("Percentiles")); + pivot_category_create_leaf (percentiles, pivot_value_new_integer ( + pc->p * 100.0)); + } - for (i = 0; i < frq->n_percentiles; i++) + for (size_t i = 0; i < frq->n_vars; i++) { - const struct percentile *pc = &frq->percentiles[i]; - - if (!pc->show) + struct var_freqs *vf = &frq->vars[i]; + if (var_is_alpha (vf->var)) continue; - if ( i == 0 ) - { - tab_text (t, 0, r, TAB_LEFT | TAT_TITLE, _("Percentiles")); - } + const struct freq_tab *ft = &vf->tab; - if (vf->tab.n_valid <= 0) - { - tab_text (t, 2, r, 0, "."); - ++r; - continue; - } + int var_idx = pivot_category_create_leaf ( + variables->root, pivot_value_new_variable (vf->var)); - if (pc->p == 0.5) - tab_text (t, 1, r, TAB_LEFT, _("50 (Median)")); - else - tab_double (t, 1, r, TAB_LEFT, pc->p * 100, NULL, RC_INTEGER); - tab_double (t, 2, r, TAB_NONE, pc->value, - var_get_print_format (vf->var), RC_OTHER); + int row = 0; + pivot_table_put2 (table, var_idx, row++, + pivot_value_new_number (ft->valid_cases)); + pivot_table_put2 (table, var_idx, row++, + pivot_value_new_number ( + ft->total_cases - ft->valid_cases)); - ++r; - } + double stat_values[FRQ_ST_count]; + calc_stats (frq, vf, stat_values); + for (int j = 0; j < FRQ_ST_count; j++) + { + if (!(frq->stats & BIT_INDEX (j))) + continue; + + union value v = { .f = vf->tab.n_valid ? stat_values[j] : SYSMIS }; + struct pivot_value *pv + = (j == FRQ_ST_MODE || j == FRQ_ST_MINIMUM || j == FRQ_ST_MAXIMUM + ? pivot_value_new_var_value (vf->var, &v) + : pivot_value_new_number (v.f)); + pivot_table_put2 (table, var_idx, row++, pv); + } - tab_title (t, "%s", var_to_string (vf->var)); + for (size_t j = 0; j < frq->n_percentiles; j++) + { + const struct percentile *pc = &frq->percentiles[j]; + if (!pc->show) + continue; - tab_submit (t); -} + union value v = { .f = vf->tab.n_valid ? pc->value : SYSMIS }; + pivot_table_put2 (table, var_idx, row++, + pivot_value_new_var_value (vf->var, &v)); + } + } + pivot_table_submit (table); +}