X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fdescriptives.c;h=ae472294a8f1e7eca3457156f89619f58f6cf100;hb=b4c6c0abd5358cb64757bec30a42be300e9ccd0f;hp=d87410fb17a4a19226db63768e6f7baed99f22d6;hpb=cb72db62c20ecab427229110820c5b053d0663c4;p=pspp-builds.git diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index d87410fb..ae472294 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010 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 @@ -35,8 +35,7 @@ #include #include #include -#include -#include +#include #include "xalloc.h" @@ -100,13 +99,13 @@ struct dsc_statistic_info static const struct dsc_statistic_info dsc_info[DSC_N_STATS] = { {"MEAN", N_("Mean"), MOMENT_MEAN}, - {"SEMEAN", N_("S E Mean"), MOMENT_VARIANCE}, + {"SEMEAN", N_("S.E. Mean"), MOMENT_VARIANCE}, {"STDDEV", N_("Std Dev"), MOMENT_VARIANCE}, {"VARIANCE", N_("Variance"), MOMENT_VARIANCE}, {"KURTOSIS", N_("Kurtosis"), MOMENT_KURTOSIS}, - {"SEKURTOSIS", N_("S E Kurt"), MOMENT_NONE}, + {"SEKURTOSIS", N_("S.E. Kurt"), MOMENT_NONE}, {"SKEWNESS", N_("Skewness"), MOMENT_SKEWNESS}, - {"SESKEWNESS", N_("S E Skew"), MOMENT_NONE}, + {"SESKEWNESS", N_("S.E. Skew"), MOMENT_NONE}, {"RANGE", N_("Range"), MOMENT_NONE}, {"MINIMUM", N_("Minimum"), MOMENT_NONE}, {"MAXIMUM", N_("Maximum"), MOMENT_NONE}, @@ -215,12 +214,12 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) dsc->show_stats = dsc->calc_stats = DEFAULT_STATS; /* Parse DESCRIPTIVES. */ - while (lex_token (lexer) != '.') + while (lex_token (lexer) != T_ENDCMD) { if (lex_match_id (lexer, "MISSING")) { - lex_match (lexer, '='); - while (lex_token (lexer) != '.' && lex_token (lexer) != '/') + lex_match (lexer, T_EQUALS); + while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) { if (lex_match_id (lexer, "VARIABLE")) dsc->missing_type = DSC_VARIABLE; @@ -233,15 +232,15 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) lex_error (lexer, NULL); goto error; } - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); } } else if (lex_match_id (lexer, "SAVE")) save_z_scores = 1; else if (lex_match_id (lexer, "FORMAT")) { - lex_match (lexer, '='); - while (lex_token (lexer) != '.' && lex_token (lexer) != '/') + lex_match (lexer, T_EQUALS); + while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) { if (lex_match_id (lexer, "LABELS")) dsc->show_var_labels = 1; @@ -260,14 +259,14 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) lex_error (lexer, NULL); goto error; } - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); } } else if (lex_match_id (lexer, "STATISTICS")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); dsc->show_stats = 0; - while (lex_token (lexer) != '.' && lex_token (lexer) != '/') + while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) { if (lex_match (lexer, T_ALL)) dsc->show_stats |= (1ul << DSC_N_STATS) - 1; @@ -275,14 +274,14 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) dsc->show_stats |= DEFAULT_STATS; else dsc->show_stats |= 1ul << (match_statistic (lexer)); - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); } if (dsc->show_stats == 0) dsc->show_stats = DEFAULT_STATS; } else if (lex_match_id (lexer, "SORT")) { - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (lex_match_id (lexer, "NAME")) dsc->sort_by_stat = DSC_NAME; else @@ -291,7 +290,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) if (dsc->sort_by_stat == DSC_NONE ) dsc->sort_by_stat = DSC_MEAN; } - if (lex_match (lexer, '(')) + if (lex_match (lexer, T_LPAREN)) { if (lex_match_id (lexer, "A")) dsc->sort_ascending = 1; @@ -299,18 +298,18 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) dsc->sort_ascending = 0; else lex_error (lexer, NULL); - lex_force_match (lexer, ')'); + lex_force_match (lexer, T_RPAREN); } } else if (var_cnt == 0) { - if (lex_look_ahead (lexer) == '=') + if (lex_look_ahead (lexer) == T_EQUALS) { lex_match_id (lexer, "VARIABLES"); - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); } - while (lex_token (lexer) != '.' && lex_token (lexer) != '/') + while (lex_token (lexer) != T_ENDCMD && lex_token (lexer) != T_SLASH) { int i; @@ -328,23 +327,23 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) } dsc->var_cnt = var_cnt; - if (lex_match (lexer, '(')) + if (lex_match (lexer, T_LPAREN)) { if (lex_token (lexer) != T_ID) { lex_error (lexer, NULL); goto error; } - if (try_name (dict, dsc, lex_tokid (lexer))) + if (try_name (dict, dsc, lex_tokcstr (lexer))) { - strcpy (dsc->vars[dsc->var_cnt - 1].z_name, lex_tokid (lexer)); + strcpy (dsc->vars[dsc->var_cnt - 1].z_name, lex_tokcstr (lexer)); z_cnt++; } else msg (SE, _("Z-score variable name %s would be" - " a duplicate variable name."), lex_tokid (lexer)); + " a duplicate variable name."), lex_tokcstr (lexer)); lex_get (lexer); - if (!lex_force_match (lexer, ')')) + if (!lex_force_match (lexer, T_RPAREN)) goto error; } } @@ -355,7 +354,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) goto error; } - lex_match (lexer, '/'); + lex_match (lexer, T_SLASH); } if (var_cnt == 0) { @@ -554,13 +553,11 @@ dump_z_table (struct dsc_proc *dsc) t = tab_create (2, cnt + 1); tab_title (t, _("Mapping of variables to corresponding Z-scores.")); - tab_columns (t, SOM_COL_DOWN); tab_headers (t, 0, 0, 1, 0); tab_box (t, TAL_1, TAL_1, TAL_0, TAL_1, 0, 0, 1, cnt); tab_hline (t, TAL_2, 0, 1, 1); tab_text (t, 0, 0, TAB_CENTER | TAT_TITLE, _("Source")); tab_text (t, 1, 0, TAB_CENTER | TAT_TITLE, _("Target")); - tab_dim (t, tab_natural_dimensions, NULL, NULL); { size_t i, y; @@ -879,7 +876,6 @@ display (struct dsc_proc *dsc) tab_box (t, -1, -1, -1, TAL_1, 1, 0, nc - 1, dsc->var_cnt); tab_hline (t, TAL_2, 0, nc - 1, 1); tab_vline (t, TAL_2, 1, 0, dsc->var_cnt); - tab_dim (t, tab_natural_dimensions, NULL, NULL); nc = 0; tab_text (t, nc++, 0, TAB_LEFT | TAT_TITLE, _("Variable"));