X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffrequencies.c;h=dc6eede8809629b61cfeb1d2551708b0a4365308;hb=18e3610ace8a5286d301e2f8ebd62bb579b2ea96;hp=7cd604c1f6e2ea20ace66080446a1d405be1d097;hpb=1e0e76eaeb51ef0c15fdcfc4bd12d9310c16a88b;p=pspp diff --git a/src/language/stats/frequencies.c b/src/language/stats/frequencies.c index 7cd604c1f6..dc6eede880 100644 --- a/src/language/stats/frequencies.c +++ b/src/language/stats/frequencies.c @@ -626,6 +626,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) for (i = 0; i < frq.n_vars; ++i) { frq.vars[i].var = vars[i]; + frq.vars[i].width = var_get_width (vars[i]); } while (lex_token (lexer) != T_ENDCMD) @@ -890,7 +891,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) hi_pcnt = lex_integer (lexer); if (hi_pcnt <= 0) { - lex_error (lexer, _("Histogram percentaage must be greater than zero.")); + lex_error (lexer, _("Histogram percentage must be greater than zero.")); } lex_get (lexer); lex_force_match (lexer, T_RPAREN); @@ -993,7 +994,7 @@ cmd_frequencies (struct lexer *lexer, struct dataset *ds) } } - if (frq.stats & FRQ_ST_MEDIAN) + if (frq.stats & BIT_INDEX (FRQ_ST_MEDIAN)) { frq.percentiles = xrealloc (frq.percentiles, @@ -1363,7 +1364,7 @@ dump_statistics (const struct frq_proc *frq, const struct var_freqs *vf, } calc_stats (vf, stat_value); - t = tab_create (3, ((frq->stats & FRQ_ST_MEDIAN) ? frq->n_stats - 1 : frq->n_stats) + 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) ;