X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fdescriptives.c;h=e78d771e147a95ea5630360d8e9c120984f96a14;hb=204a1ee35aebcc2cf955017070c1a3638cdaee22;hp=70751495024e6f9767943a25d8349449ee981273;hpb=c3bd77adba5746aae895e6a354aada4e694c0e3f;p=pspp diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index 7075149502..e78d771e14 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009 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 @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -39,6 +38,8 @@ #include #include +#include "xalloc.h" + #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -99,13 +100,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}, @@ -122,7 +123,7 @@ static const struct dsc_statistic_info dsc_info[DSC_N_STATS] = struct dsc_var { const struct variable *v; /* Variable to calculate on. */ - char z_name[LONG_NAME_LEN + 1]; /* Name for z-score variable. */ + char z_name[VAR_NAME_LEN + 1]; /* Name for z-score variable. */ double valid, missing; /* Valid, missing counts. */ struct moments *moments; /* Moments. */ double min, max; /* Maximum and mimimum values. */ @@ -494,7 +495,7 @@ static bool generate_z_varname (const struct dictionary *dict, struct dsc_proc *dsc, char *z_name, const char *var_name, int *z_cnt) { - char name[LONG_NAME_LEN + 1]; + char name[VAR_NAME_LEN + 1]; /* Try a name based on the original variable name. */ name[0] = 'Z'; @@ -551,15 +552,15 @@ dump_z_table (struct dsc_proc *dsc) cnt++; } - t = tab_create (2, cnt + 1, 0); + t = tab_create (2, cnt + 1); tab_title (t, _("Mapping of variables to corresponding Z-scores.")); - tab_columns (t, SOM_COL_DOWN, 1); + 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); + tab_dim (t, tab_natural_dimensions, NULL, NULL); { size_t i, y; @@ -582,7 +583,7 @@ dump_z_table (struct dsc_proc *dsc) (either system or user-missing values that weren't included). */ static int -descriptives_trns_proc (void *trns_, struct ccase * c, +descriptives_trns_proc (void *trns_, struct ccase **c, casenumber case_idx UNUSED) { struct dsc_trns *t = trns_; @@ -595,7 +596,7 @@ descriptives_trns_proc (void *trns_, struct ccase * c, assert(t->vars); for (vars = t->vars; vars < t->vars + t->var_cnt; vars++) { - double score = case_num (c, *vars); + double score = case_num (*c, *vars); if (var_is_num_missing (*vars, score, t->exclude)) { all_sysmis = 1; @@ -604,10 +605,11 @@ descriptives_trns_proc (void *trns_, struct ccase * c, } } + *c = case_unshare (*c); for (z = t->z_scores; z < t->z_scores + t->z_score_cnt; z++) { - double input = case_num (c, z->src_var); - double *output = &case_data_rw (c, z->z_var)->f; + double input = case_num (*c, z->src_var); + double *output = &case_data_rw (*c, z->z_var)->f; if (z->mean == SYSMIS || z->std_dev == SYSMIS || all_sysmis || var_is_num_missing (z->src_var, input, t->exclude)) @@ -694,16 +696,17 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, struct dataset *ds) { struct casereader *pass1, *pass2; - struct ccase c; + struct ccase *c; size_t i; - if (!casereader_peek (group, 0, &c)) + c = casereader_peek (group, 0); + if (c == NULL) { casereader_destroy (group); return; } - output_split_file_values (ds, &c); - case_destroy (&c); + output_split_file_values (ds, c); + case_unref (c); group = casereader_create_filter_weight (group, dataset_dict (ds), NULL, NULL); @@ -725,12 +728,12 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, dsc->valid = 0.; /* First pass to handle most of the work. */ - for (; casereader_read (pass1, &c); case_destroy (&c)) + for (; (c = casereader_read (pass1)) != NULL; case_unref (c)) { - double weight = dict_get_case_weight (dataset_dict (ds), &c, NULL); + double weight = dict_get_case_weight (dataset_dict (ds), c, NULL); /* Check for missing values. */ - if (listwise_missing (dsc, &c)) + if (listwise_missing (dsc, c)) { dsc->missing_listwise += weight; if (dsc->missing_type == DSC_LISTWISE) @@ -741,7 +744,7 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; - double x = case_num (&c, dv->v); + double x = case_num (c, dv->v); if (var_is_num_missing (dv->v, x, dsc->exclude)) { @@ -767,18 +770,18 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, /* Second pass for higher-order moments. */ if (dsc->max_moment > MOMENT_MEAN) { - for (; casereader_read (pass2, &c); case_destroy (&c)) + for (; (c = casereader_read (pass2)) != NULL; case_unref (c)) { - double weight = dict_get_case_weight (dataset_dict (ds), &c, NULL); + double weight = dict_get_case_weight (dataset_dict (ds), c, NULL); /* Check for missing values. */ - if (dsc->missing_type == DSC_LISTWISE && listwise_missing (dsc, &c)) + if (dsc->missing_type == DSC_LISTWISE && listwise_missing (dsc, c)) continue; for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; - double x = case_num (&c, dv->v); + double x = case_num (c, dv->v); if (var_is_num_missing (dv->v, x, dsc->exclude)) continue; @@ -870,13 +873,13 @@ display (struct dsc_proc *dsc) sort (dsc->vars, dsc->var_cnt, sizeof *dsc->vars, descriptives_compare_dsc_vars, dsc); - t = tab_create (nc, dsc->var_cnt + 1, 0); + t = tab_create (nc, dsc->var_cnt + 1); tab_headers (t, 1, 0, 1, 0); tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, nc - 1, dsc->var_cnt); 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); + tab_dim (t, tab_natural_dimensions, NULL, NULL); nc = 0; tab_text (t, nc++, 0, TAB_LEFT | TAT_TITLE, _("Variable")); @@ -902,12 +905,13 @@ display (struct dsc_proc *dsc) nc = 0; tab_text (t, nc++, i + 1, TAB_LEFT, var_get_name (dv->v)); - tab_text (t, nc++, i + 1, TAT_PRINTF, "%g", dv->valid); + tab_text_format (t, nc++, i + 1, 0, "%g", dv->valid); if (dsc->format == DSC_SERIAL) - tab_text (t, nc++, i + 1, TAT_PRINTF, "%g", dv->missing); + tab_text_format (t, nc++, i + 1, 0, "%g", dv->missing); + for (j = 0; j < DSC_N_STATS; j++) if (dsc->show_stats & (1ul << j)) - tab_float (t, nc++, i + 1, TAB_NONE, dv->stats[j], 10, 3); + tab_double (t, nc++, i + 1, TAB_NONE, dv->stats[j], NULL); } tab_title (t, _("Valid cases = %g; cases with missing value(s) = %g."),