X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fdescriptives.c;h=edfcca08e4a1f8d4989bb6a7930b1662796af053;hb=11d2ffde279bad43d0c271f7fbfad383969e063f;hp=598752caf1deba6011feb81044af5db7adc98f45;hpb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;p=pspp diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c index 598752caf1..edfcca08e4 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 @@ -64,11 +63,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. */ + 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). */ @@ -79,7 +77,7 @@ struct dsc_trns 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. */ @@ -152,7 +150,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,7 +175,7 @@ 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 *); @@ -198,7 +196,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) 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; @@ -207,7 +205,7 @@ cmd_descriptives (struct lexer *lexer, struct dataset *ds) 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); @@ -372,7 +370,7 @@ 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) @@ -493,7 +491,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]; @@ -596,10 +594,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 - && var_is_num_user_missing (*vars, score))) + double score = case_num (c, *vars); + if (var_is_num_missing (*vars, score, t->exclude)) { all_sysmis = 1; break; @@ -609,13 +605,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 - && var_is_num_user_missing (z->v, 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; @@ -650,7 +644,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; @@ -677,11 +671,10 @@ setup_z_trns (struct dsc_proc *dsc, struct dataset *ds) 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; } } @@ -741,12 +734,10 @@ 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 - && var_is_num_user_missing (dv->v, x)))) + && var_is_num_missing (dv->v, x, dsc->exclude)) { dv->missing += weight; continue; @@ -776,19 +767,16 @@ calc_descriptives (const struct ccase *first, continue; /* 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 - && var_is_num_user_missing (dv->v, x)))) + && var_is_num_missing (dv->v, x, dsc->exclude)) continue; if (dv->moments != NULL) @@ -850,11 +838,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 - && var_is_num_user_missing (dv->v, x))) + if (var_is_num_missing (dv->v, x, dsc->exclude)) return true; } return false;