X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fdescriptives.c;h=1ffe861552b6aaae990816bb08097a2e4db7f617;hb=a2884fe5499f6953c28341023ece8d486344ddfe;hp=8efb5f1fb46209814c77baf4e9d1b499f31ee9bd;hpb=6f3865480503c571963d8a2d1af858a4d72d4e88;p=pspp diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index 8efb5f1fb4..1ffe861552 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-2000, 2009-2012 Free Software Foundation, Inc. + Copyright (C) 1997-2000, 2009-2014 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 @@ -16,6 +16,7 @@ #include +#include #include #include #include @@ -75,6 +76,7 @@ struct dsc_trns size_t var_cnt; /* Number of variables. */ enum dsc_missing_type missing_type; /* Treatment of missing values. */ enum mv_class exclude; /* Classes of missing values to exclude. */ + struct variable *filter; /* Dictionary FILTER BY variable. */ struct casereader *z_reader; /* Reader for count, mean, stddev. */ casenumber count; /* Number left in this SPLIT FILE group.*/ bool ok; @@ -397,6 +399,13 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) } } + /* It would be better to handle Z scores correctly (however we define + that) when TEMPORARY is in effect, but in the meantime this at least + prevents a use-after-free error. See bug #38786. */ + if (proc_make_temporary_transformations_permanent (ds)) + msg (SW, _("DESCRIPTIVES with Z scores ignores TEMPORARY. " + "Temporary transformations will be made permanent.")); + proto = caseproto_create (); for (i = 0; i < 1 + 2 * z_cnt; i++) proto = caseproto_add_width (proto, 0); @@ -434,7 +443,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) dsc->vars[i].moments = moments_create (dsc->max_moment); /* Data pass. */ - grouper = casegrouper_create_splits (proc_open (ds), dict); + grouper = casegrouper_create_splits (proc_open_filtering (ds, false), dict); while (casegrouper_get_next_group (grouper, &group)) calc_descriptives (dsc, group, ds); ok = casegrouper_destroy (grouper); @@ -604,6 +613,15 @@ dump_z_table (struct dsc_proc *dsc) tab_submit (t); } +static void +descriptives_set_all_sysmis_zscores (const struct dsc_trns *t, struct ccase *c) +{ + const struct dsc_z_score *z; + + for (z = t->z_scores; z < t->z_scores + t->z_score_cnt; z++) + case_data_rw (c, z->z_var)->f = SYSMIS; +} + /* Transformation function to calculate Z-scores. Will return SYSMIS if any of the following are true: 1) mean or standard deviation is SYSMIS 2) score is SYSMIS 3) score is user missing and they were not included in the original @@ -617,7 +635,18 @@ descriptives_trns_proc (void *trns_, struct ccase **c, struct dsc_trns *t = trns_; struct dsc_z_score *z; const struct variable **vars; - int all_sysmis = 0; + + *c = case_unshare (*c); + + if (t->filter) + { + double f = case_num (*c, t->filter); + if (f == 0.0 || var_is_num_missing (t->filter, f, MV_ANY)) + { + descriptives_set_all_sysmis_zscores (t, *c); + return TRNS_CONTINUE; + } + } if (t->count <= 0) { @@ -643,8 +672,8 @@ descriptives_trns_proc (void *trns_, struct ccase **c, msg (SE, _("Internal error processing Z scores")); t->ok = false; } - for (z = t->z_scores; z < t->z_scores + t->z_score_cnt; z++) - z->mean = z->std_dev = SYSMIS; + descriptives_set_all_sysmis_zscores (t, *c); + return TRNS_CONTINUE; } } t->count--; @@ -657,19 +686,18 @@ descriptives_trns_proc (void *trns_, struct ccase **c, double score = case_num (*c, *vars); if (var_is_num_missing (*vars, score, t->exclude)) { - all_sysmis = 1; - break; + descriptives_set_all_sysmis_zscores (t, *c); + return TRNS_CONTINUE; } } } - *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; - if (z->mean == SYSMIS || z->std_dev == SYSMIS || all_sysmis + if (z->mean == SYSMIS || z->std_dev == SYSMIS || var_is_num_missing (z->src_var, input, t->exclude)) *output = SYSMIS; else @@ -689,6 +717,8 @@ descriptives_trns_free (void *trns_) casereader_destroy (t->z_reader); assert((t->missing_type != DSC_LISTWISE) ^ (t->vars != NULL)); free (t->vars); + free (t); + return ok; } @@ -720,6 +750,7 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds) t->var_cnt = 0; t->vars = NULL; } + t->filter = dict_get_filter (dataset_dict (ds)); t->z_reader = casewriter_make_reader (dsc->z_writer); t->count = 0; t->ok = true; @@ -732,11 +763,13 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds) { struct dsc_z_score *z; struct variable *dst_var; + char *label; dst_var = dict_create_var_assert (dataset_dict (ds), dv->z_name, 0); - var_set_label (dst_var, - xasprintf (_("Z-score of %s"),var_to_string (dv->v)), - false); + + label = xasprintf (_("Z-score of %s"),var_to_string (dv->v)); + var_set_label (dst_var, label); + free (label); z = &t->z_scores[cnt++]; z->src_var = dv->v; @@ -758,6 +791,7 @@ static void calc_descriptives (struct dsc_proc *dsc, struct casereader *group, struct dataset *ds) { + struct variable *filter = dict_get_filter (dataset_dict (ds)); struct casereader *pass1, *pass2; casenumber count; struct ccase *c; @@ -798,6 +832,13 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, { double weight = dict_get_case_weight (dataset_dict (ds), c, NULL); + if (filter) + { + double f = case_num (c, filter); + if (f == 0.0 || var_is_num_missing (filter, f, MV_ANY)) + continue; + } + /* Check for missing values. */ if (listwise_missing (dsc, c)) { @@ -842,6 +883,13 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, { double weight = dict_get_case_weight (dataset_dict (ds), c, NULL); + if (filter) + { + double f = case_num (c, filter); + if (f == 0.0 || var_is_num_missing (filter, f, MV_ANY)) + continue; + } + /* Check for missing values. */ if (dsc->missing_type == DSC_LISTWISE && listwise_missing (dsc, c)) continue; @@ -863,7 +911,7 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, } /* Calculate results. */ - if (dsc->z_writer) + if (dsc->z_writer && count > 0) { c = case_create (casewriter_get_proto (dsc->z_writer)); z_idx = 0; @@ -906,7 +954,7 @@ calc_descriptives (struct dsc_proc *dsc, struct casereader *group, if (dsc->calc_stats & (1ul << DSC_SUM)) dv->stats[DSC_SUM] = W * dv->stats[DSC_MEAN]; - if (dv->z_name) + if (dv->z_name && c != NULL) { case_data_rw_idx (c, z_idx++)->f = dv->stats[DSC_MEAN]; case_data_rw_idx (c, z_idx++)->f = dv->stats[DSC_STDDEV]; @@ -990,17 +1038,18 @@ display (struct dsc_proc *dsc) nc = 0; tab_text (t, nc++, i + 1, TAB_LEFT, var_to_string (dv->v)); - tab_text_format (t, nc++, i + 1, 0, "%g", dv->valid); + tab_text_format (t, nc++, i + 1, 0, "%.*g", DBL_DIG + 1, dv->valid); if (dsc->format == DSC_SERIAL) - tab_text_format (t, nc++, i + 1, 0, "%g", dv->missing); + tab_text_format (t, nc++, i + 1, 0, "%.*g", DBL_DIG + 1, dv->missing); for (j = 0; j < DSC_N_STATS; j++) if (dsc->show_stats & (1ul << j)) - tab_double (t, nc++, i + 1, TAB_NONE, dv->stats[j], NULL); + tab_double (t, nc++, i + 1, TAB_NONE, dv->stats[j], NULL, RC_OTHER); } - tab_title (t, _("Valid cases = %g; cases with missing value(s) = %g."), - dsc->valid, dsc->missing_listwise); + tab_title (t, _("Valid cases = %.*g; cases with missing value(s) = %.*g."), + DBL_DIG + 1, dsc->valid, + DBL_DIG + 1, dsc->missing_listwise); tab_submit (t); }