X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fdescriptives.c;h=3eb638bd79316e099752a23bd89a715ecef1850c;hb=92c09e564002d356d20fc1e2e131027ef89f6748;hp=c1653dc745d24b5cee4043cf94f04fd80867b4ec;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index c1653dc745..3eb638bd79 100644 --- a/src/language/stats/descriptives.c +++ b/src/language/stats/descriptives.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -17,16 +16,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* FIXME: Many possible optimizations. */ - #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -64,11 +61,10 @@ enum dsc_missing_type calculating a Z-score. */ struct dsc_z_score { - int src_idx; /* Source index into case data. */ - int dst_idx; /* Destination index into case data. */ + const struct variable *src_var; /* Variable on which z-score is based. */ + struct variable *z_var; /* New z-score variable. */ double mean; /* Distribution mean. */ double std_dev; /* Distribution standard deviation. */ - struct variable *v; /* Variable on which z-score is based. */ }; /* DESCRIPTIVES transformation (for calculating Z-scores). */ @@ -76,10 +72,10 @@ struct dsc_trns { struct dsc_z_score *z_scores; /* Array of Z-scores. */ int z_score_cnt; /* Number of Z-scores. */ - struct variable **vars; /* Variables for listwise missing checks. */ + const struct variable **vars; /* Variables for listwise missing checks. */ size_t var_cnt; /* Number of variables. */ enum dsc_missing_type missing_type; /* Treatment of missing values. */ - int include_user_missing; /* Nonzero to include user-missing values. */ + enum mv_class exclude; /* Classes of missing values to exclude. */ }; /* Statistics. Used as bit indexes, so must be 32 or fewer. */ @@ -128,7 +124,7 @@ static const struct dsc_statistic_info dsc_info[DSC_N_STATS] = /* A variable specified on DESCRIPTIVES. */ struct dsc_var { - struct variable *v; /* Variable to calculate on. */ + const struct variable *v; /* Variable to calculate on. */ char z_name[LONG_NAME_LEN + 1]; /* Name for z-score variable. */ double valid, missing; /* Valid, missing counts. */ struct moments *moments; /* Moments. */ @@ -152,7 +148,7 @@ struct dsc_proc /* User options. */ enum dsc_missing_type missing_type; /* Treatment of missing values. */ - int include_user_missing; /* Nonzero to include user-missing values. */ + enum mv_class exclude; /* Classes of missing values to exclude. */ int show_var_labels; /* Nonzero to show variable labels. */ int show_index; /* Nonzero to show variable index. */ enum dsc_format format; /* Output format. */ @@ -177,14 +173,13 @@ static bool try_name (const struct dictionary *dict, struct dsc_proc *dsc, const char *name); static bool generate_z_varname (const struct dictionary *dict, struct dsc_proc *dsc, char *z_name, - const char *name, size_t *z_cnt); + const char *name, int *z_cnt); static void dump_z_table (struct dsc_proc *); static void setup_z_trns (struct dsc_proc *, struct dataset *); /* Procedure execution functions. */ -static bool calc_descriptives (const struct ccase *first, - const struct casefile *, void *dsc_, - const struct dataset *); +static void calc_descriptives (struct dsc_proc *, struct casereader *, + struct dataset *); static void display (struct dsc_proc *dsc); /* Parser and outline. */ @@ -195,19 +190,22 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) { struct dictionary *dict = dataset_dict (ds); struct dsc_proc *dsc; - struct variable **vars = NULL; + const struct variable **vars = NULL; size_t var_cnt = 0; int save_z_scores = 0; - size_t z_cnt = 0; + int z_cnt = 0; size_t i; bool ok; + struct casegrouper *grouper; + struct casereader *group; + /* Create and initialize dsc. */ dsc = xmalloc (sizeof *dsc); dsc->vars = NULL; dsc->var_cnt = 0; dsc->missing_type = DSC_VARIABLE; - dsc->include_user_missing = 0; + dsc->exclude = MV_ANY; dsc->show_var_labels = 1; dsc->show_index = 0; dsc->format = DSC_LINE; @@ -231,7 +229,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "LISTWISE")) dsc->missing_type = DSC_LISTWISE; else if (lex_match_id (lexer, "INCLUDE")) - dsc->include_user_missing = 1; + dsc->exclude = MV_SYSTEM; else { lex_error (lexer, NULL); @@ -318,11 +316,11 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) { int i; - if (!parse_variables (lexer, dataset_dict (ds), &vars, &var_cnt, + if (!parse_variables_const (lexer, dict, &vars, &var_cnt, PV_APPEND | PV_NO_DUPLICATE | PV_NUMERIC)) goto error; - dsc->vars = xnrealloc (dsc->vars, var_cnt, sizeof *dsc->vars); + dsc->vars = xnrealloc ((void *)dsc->vars, var_cnt, sizeof *dsc->vars); for (i = dsc->var_cnt; i < var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; @@ -372,13 +370,14 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) { if (save_z_scores) { - size_t gen_cnt = 0; + int gen_cnt = 0; for (i = 0; i < dsc->var_cnt; i++) if (dsc->vars[i].z_name[0] == 0) { if (!generate_z_varname (dict, dsc, dsc->vars[i].z_name, - dsc->vars[i].v->name, &gen_cnt)) + var_get_name (dsc->vars[i].v), + &gen_cnt)) goto error; z_cnt++; } @@ -413,8 +412,12 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) for (i = 0; i < dsc->var_cnt; i++) dsc->vars[i].moments = moments_create (dsc->max_moment); - /* Data pass. */ - ok = multipass_procedure_with_splits (ds, calc_descriptives, dsc); + /* Data pass. FIXME: error handling. */ + grouper = casegrouper_create_splits (proc_open (ds), dict); + while (casegrouper_get_next_group (grouper, &group)) + calc_descriptives (dsc, group, ds); + ok = casegrouper_destroy (grouper); + ok = proc_commit (ds) && ok; /* Z-scoring! */ if (ok && z_cnt) @@ -492,7 +495,7 @@ try_name (const struct dictionary *dict, struct dsc_proc *dsc, copies the new name into Z_NAME. On failure, returns false. */ static bool generate_z_varname (const struct dictionary *dict, struct dsc_proc *dsc, char *z_name, - const char *var_name, size_t *z_cnt) + const char *var_name, int *z_cnt) { char name[LONG_NAME_LEN + 1]; @@ -567,7 +570,7 @@ dump_z_table (struct dsc_proc *dsc) for (i = 0, y = 1; i < dsc->var_cnt; i++) if (dsc->vars[i].z_name[0] != '\0') { - tab_text (t, 0, y, TAB_LEFT, dsc->vars[i].v->name); + tab_text (t, 0, y, TAB_LEFT, var_get_name (dsc->vars[i].v)); tab_text (t, 1, y++, TAB_LEFT, dsc->vars[i].z_name); } } @@ -587,7 +590,7 @@ descriptives_trns_proc (void *trns_, struct ccase * c, { struct dsc_trns *t = trns_; struct dsc_z_score *z; - struct variable **vars; + const struct variable **vars; int all_sysmis = 0; if (t->missing_type == DSC_LISTWISE) @@ -595,10 +598,8 @@ 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)->fv); - if ( score == SYSMIS - || (!t->include_user_missing - && mv_is_num_user_missing (&(*vars)->miss, score))) + double score = case_num (c, *vars); + if (var_is_num_missing (*vars, score, t->exclude)) { all_sysmis = 1; break; @@ -608,13 +609,11 @@ descriptives_trns_proc (void *trns_, struct ccase * c, for (z = t->z_scores; z < t->z_scores + t->z_score_cnt; z++) { - double input = case_num (c, z->src_idx); - double *output = &case_data_rw (c, z->dst_idx)->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 || input == SYSMIS - || (!t->include_user_missing - && mv_is_num_user_missing (&z->v->miss, input))) + if (z->mean == SYSMIS || z->std_dev == SYSMIS || all_sysmis + || var_is_num_missing (z->src_var, input, t->exclude)) *output = SYSMIS; else *output = (input - z->mean) / z->std_dev; @@ -649,7 +648,7 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds) t->z_scores = xnmalloc (cnt, sizeof *t->z_scores); t->z_score_cnt = cnt; t->missing_type = dsc->missing_type; - t->include_user_missing = dsc->include_user_missing; + t->exclude = dsc->exclude; if ( t->missing_type == DSC_LISTWISE ) { t->var_cnt = dsc->var_cnt; @@ -669,29 +668,17 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds) if (dv->z_name[0] != '\0') { struct dsc_z_score *z; - char *cp; struct variable *dst_var; dst_var = dict_create_var_assert (dataset_dict (ds), dv->z_name, 0); - if (dv->v->label) - { - dst_var->label = xmalloc (strlen (dv->v->label) + 12); - cp = stpcpy (dst_var->label, _("Z-score of ")); - strcpy (cp, dv->v->label); - } - else - { - dst_var->label = xmalloc (strlen (dv->v->name) + 12); - cp = stpcpy (dst_var->label, _("Z-score of ")); - strcpy (cp, dv->v->name); - } + var_set_label (dst_var, xasprintf (_("Z-score of %s"), + var_to_string (dv->v))); z = &t->z_scores[cnt++]; - z->src_idx = dv->v->fv; - z->dst_idx = dst_var->fv; + z->src_var = dv->v; + z->z_var = dst_var; z->mean = dv->stats[DSC_MEAN]; z->std_dev = dv->stats[DSC_STDDEV]; - z->v = dv->v; } } @@ -705,17 +692,25 @@ static bool listwise_missing (struct dsc_proc *dsc, const struct ccase *c); /* Calculates and displays descriptive statistics for the cases in CF. */ -static bool -calc_descriptives (const struct ccase *first, - const struct casefile *cf, void *dsc_, - const struct dataset *ds) +static void +calc_descriptives (struct dsc_proc *dsc, struct casereader *group, + struct dataset *ds) { - struct dsc_proc *dsc = dsc_; - struct casereader *reader; + struct casereader *pass1, *pass2; struct ccase c; size_t i; - output_split_file_values (ds, first); + if (!casereader_peek (group, 0, &c)) + return; + output_split_file_values (ds, &c); + case_destroy (&c); + + group = casereader_create_filter_weight (group, dataset_dict (ds), + NULL, NULL); + + casereader_split (group, &pass1, &pass2); + if (dsc->max_moment <= MOMENT_MEAN) + casereader_destroy (pass2); for (i = 0; i < dsc->var_cnt; i++) { @@ -731,13 +726,9 @@ calc_descriptives (const struct ccase *first, dsc->valid = 0.; /* First pass to handle most of the work. */ - for (reader = casefile_get_reader (cf, NULL); - casereader_read (reader, &c); - case_destroy (&c)) + for (; casereader_read (pass1, &c); case_destroy (&c)) { - double weight = dict_get_case_weight (dataset_dict (ds), &c, &dsc->bad_warn); - if (weight <= 0.0) - continue; + double weight = dict_get_case_weight (dataset_dict (ds), &c, NULL); /* Check for missing values. */ if (listwise_missing (dsc, &c)) @@ -751,12 +742,9 @@ calc_descriptives (const struct ccase *first, for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; - double x = case_num (&c, dv->v->fv); + double x = case_num (&c, dv->v); - if (dsc->missing_type != DSC_LISTWISE - && (x == SYSMIS - || (!dsc->include_user_missing - && mv_is_num_user_missing (&dv->v->miss, x)))) + if (var_is_num_missing (dv->v, x, dsc->exclude)) { dv->missing += weight; continue; @@ -771,43 +759,36 @@ calc_descriptives (const struct ccase *first, dv->max = x; } } - casereader_destroy (reader); + if (!casereader_destroy (pass1)) + return; /* Second pass for higher-order moments. */ if (dsc->max_moment > MOMENT_MEAN) { - for (reader = casefile_get_reader (cf, NULL); - casereader_read (reader, &c); - case_destroy (&c)) + for (; casereader_read (pass2, &c); case_destroy (&c)) { - double weight = dict_get_case_weight (dataset_dict (ds), &c, - &dsc->bad_warn); - if (weight <= 0.0) - continue; + double weight = dict_get_case_weight (dataset_dict (ds), &c, NULL); /* Check for missing values. */ - if (listwise_missing (dsc, &c) - && dsc->missing_type == DSC_LISTWISE) + 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->fv); + double x = case_num (&c, dv->v); - if (dsc->missing_type != DSC_LISTWISE - && (x == SYSMIS - || (!dsc->include_user_missing - && mv_is_num_user_missing (&dv->v->miss, x)))) + if (var_is_num_missing (dv->v, x, dsc->exclude)) continue; if (dv->moments != NULL) moments_pass_two (dv->moments, x, weight); } } - casereader_destroy (reader); + if (!casereader_destroy (pass2)) + return; } - + /* Calculate results. */ for (i = 0; i < dsc->var_cnt; i++) { @@ -846,8 +827,6 @@ calc_descriptives (const struct ccase *first, /* Output results. */ display (dsc); - - return true; } /* Returns true if any of the descriptives variables in DSC's @@ -860,11 +839,9 @@ listwise_missing (struct dsc_proc *dsc, const struct ccase *c) for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; - double x = case_num (c, dv->v->fv); + double x = case_num (c, dv->v); - if (x == SYSMIS - || (!dsc->include_user_missing - && mv_is_num_user_missing (&dv->v->miss, x))) + if (var_is_num_missing (dv->v, x, dsc->exclude)) return true; } return false; @@ -922,7 +899,7 @@ display (struct dsc_proc *dsc) size_t j; nc = 0; - tab_text (t, nc++, i + 1, TAB_LEFT, dv->v->name); + tab_text (t, nc++, i + 1, TAB_LEFT, var_get_name (dv->v)); tab_text (t, nc++, i + 1, TAT_PRINTF, "%g", dv->valid); if (dsc->format == DSC_SERIAL) tab_text (t, nc++, i + 1, TAT_PRINTF, "%g", dv->missing); @@ -949,7 +926,7 @@ descriptives_compare_dsc_vars (const void *a_, const void *b_, const void *dsc_) int result; if (dsc->sort_by_stat == DSC_NAME) - result = strcasecmp (a->v->name, b->v->name); + result = strcasecmp (var_get_name (a->v), var_get_name (b->v)); else { double as = a->stats[dsc->sort_by_stat];