X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdescript.c;h=0a96b65ec5aaabfd86411254d33d4533cdf8dc71;hb=8fa7f3f6640c0eec450149cf5ccfab15d5391f55;hp=93c31717d341042217038331e3f082912339c965;hpb=bf6d99567a762b20bee4bb71147b6387c986bb90;p=pspp diff --git a/src/descript.c b/src/descript.c index 93c31717d3..0a96b65ec5 100644 --- a/src/descript.c +++ b/src/descript.c @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ /* FIXME: Many possible optimizations. */ @@ -26,8 +26,10 @@ #include #include "algorithm.h" #include "alloc.h" +#include "case.h" #include "casefile.h" #include "command.h" +#include "dictionary.h" #include "lexer.h" #include "error.h" #include "magic.h" @@ -37,6 +39,10 @@ #include "var.h" #include "vfm.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) +#define N_(msgid) msgid + /* DESCRIPTIVES private data. */ struct dsc_proc; @@ -118,7 +124,7 @@ static const struct dsc_statistic_info dsc_info[DSC_N_STATS] = struct dsc_var { struct variable *v; /* Variable to calculate on. */ - char z_name[9]; /* Name for z-score variable. */ + char z_name[LONG_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. */ @@ -164,7 +170,7 @@ static void free_dsc_proc (struct dsc_proc *); /* Z-score functions. */ static int try_name (struct dsc_proc *dsc, char *name); static int generate_z_varname (struct dsc_proc *dsc, char *z_name, - const char *name, int *z_cnt); + const char *name, size_t *z_cnt); static void dump_z_table (struct dsc_proc *); static void setup_z_trns (struct dsc_proc *); @@ -180,10 +186,10 @@ cmd_descriptives (void) { struct dsc_proc *dsc; struct variable **vars = NULL; - int var_cnt = 0; + size_t var_cnt = 0; int save_z_scores = 0; - int z_cnt = 0; - int i; + size_t z_cnt = 0; + size_t i; /* Create and initialize dsc. */ dsc = xmalloc (sizeof *dsc); @@ -261,11 +267,7 @@ cmd_descriptives (void) else if (lex_match_id ("DEFAULT")) dsc->show_stats |= DEFAULT_STATS; else - { - dsc->show_stats |= 1ul << (match_statistic ()); - if (dsc->show_stats == DSC_NONE) - dsc->show_stats = DEFAULT_STATS; - } + dsc->show_stats |= 1ul << (match_statistic ()); lex_match (','); } if (dsc->show_stats == 0) @@ -309,7 +311,7 @@ cmd_descriptives (void) PV_APPEND | PV_NO_DUPLICATE | PV_NUMERIC)) goto error; - dsc->vars = xrealloc (dsc->vars, sizeof *dsc->vars * var_cnt); + dsc->vars = xnrealloc (dsc->vars, var_cnt, sizeof *dsc->vars); for (i = dsc->var_cnt; i < var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; @@ -359,7 +361,7 @@ cmd_descriptives (void) { if (save_z_scores) { - int gen_cnt = 0; + size_t gen_cnt = 0; for (i = 0; i < dsc->var_cnt; i++) if (dsc->vars[i].z_name[0] == 0) @@ -462,12 +464,12 @@ free_dsc_proc (struct dsc_proc *dsc) static int try_name (struct dsc_proc *dsc, char *name) { - int i; + size_t i; if (dict_lookup_var (default_dict, name) != NULL) return 0; for (i = 0; i < dsc->var_cnt; i++) - if (!strcmp (dsc->vars[i].z_name, name)) + if (!strcasecmp (dsc->vars[i].z_name, name)) return 0; return 1; } @@ -478,14 +480,13 @@ try_name (struct dsc_proc *dsc, char *name) copies the new name into Z_NAME. On failure, returns zero. */ static int generate_z_varname (struct dsc_proc *dsc, char *z_name, - const char *var_name, int *z_cnt) + const char *var_name, size_t *z_cnt) { - char name[10]; + char name[LONG_NAME_LEN + 1]; /* Try a name based on the original variable name. */ name[0] = 'Z'; - strcpy (name + 1, var_name); - name[8] = '\0'; + str_copy_trunc (name + 1, sizeof name - 1, var_name); if (try_name (dsc, name)) { strcpy (z_name, name); @@ -526,11 +527,11 @@ generate_z_varname (struct dsc_proc *dsc, char *z_name, static void dump_z_table (struct dsc_proc *dsc) { - int cnt = 0; + size_t cnt = 0; struct tab_table *t; { - int i; + size_t i; for (i = 0; i < dsc->var_cnt; i++) if (dsc->vars[i].z_name[0] != '\0') @@ -548,7 +549,7 @@ dump_z_table (struct dsc_proc *dsc) tab_dim (t, tab_natural_dimensions); { - int i, y; + size_t i, y; for (i = 0, y = 1; i < dsc->var_cnt; i++) if (dsc->vars[i].z_name[0] != '\0') @@ -569,7 +570,7 @@ dump_z_table (struct dsc_proc *dsc) */ static int descriptives_trns_proc (struct trns_header *trns, struct ccase * c, - int case_num UNUSED) + int case_idx UNUSED) { struct dsc_trns *t = (struct dsc_trns *) trns; struct dsc_z_score *z; @@ -581,9 +582,10 @@ descriptives_trns_proc (struct trns_header *trns, struct ccase * c, assert(t->vars); for (vars = t->vars; vars < t->vars + t->var_cnt; vars++) { - double score = c->data[(*vars)->fv].f; - if ( score == SYSMIS || (!t->include_user_missing - && is_num_user_missing(score, *vars)) ) + double score = case_num (c, (*vars)->fv); + if ( score == SYSMIS + || (!t->include_user_missing + && mv_is_num_user_missing (&(*vars)->miss, score))) { all_sysmis = 1; break; @@ -593,14 +595,16 @@ descriptives_trns_proc (struct trns_header *trns, struct ccase * c, for (z = t->z_scores; z < t->z_scores + t->z_score_cnt; z++) { - double score = c->data[z->src_idx].f; + double input = case_num (c, z->src_idx); + double *output = &case_data_rw (c, z->dst_idx)->f; if (z->mean == SYSMIS || z->std_dev == SYSMIS - || all_sysmis || score == SYSMIS - || (!t->include_user_missing && is_num_user_missing(score, z->v))) - c->data[z->dst_idx].f = SYSMIS; + || all_sysmis || input == SYSMIS + || (!t->include_user_missing + && mv_is_num_user_missing (&z->v->miss, input))) + *output = SYSMIS; else - c->data[z->dst_idx].f = (score - z->mean) / z->std_dev; + *output = (input - z->mean) / z->std_dev; } return -1; } @@ -621,7 +625,7 @@ static void setup_z_trns (struct dsc_proc *dsc) { struct dsc_trns *t; - int cnt, i; + size_t cnt, i; for (cnt = i = 0; i < dsc->var_cnt; i++) if (dsc->vars[i].z_name[0] != '\0') @@ -630,14 +634,14 @@ setup_z_trns (struct dsc_proc *dsc) t = xmalloc (sizeof *t); t->h.proc = descriptives_trns_proc; t->h.free = descriptives_trns_free; - t->z_scores = xmalloc (cnt * sizeof *t->z_scores); + 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; if ( t->missing_type == DSC_LISTWISE ) { t->var_cnt = dsc->var_cnt; - t->vars = xmalloc(t->var_cnt * sizeof *t->vars); + t->vars = xnmalloc (t->var_cnt, sizeof *t->vars); for (i = 0; i < t->var_cnt; i++) t->vars[i] = dsc->vars[i].v; } @@ -695,8 +699,8 @@ calc_descriptives (const struct casefile *cf, void *dsc_) { struct dsc_proc *dsc = dsc_; struct casereader *reader; - const struct ccase *c; - int i; + struct ccase c; + size_t i; for (i = 0; i < dsc->var_cnt; i++) { @@ -712,15 +716,16 @@ calc_descriptives (const struct casefile *cf, void *dsc_) dsc->valid = 0.; /* First pass to handle most of the work. */ - reader = casefile_get_reader (cf); - while (casereader_read (reader, &c)) + for (reader = casefile_get_reader (cf); + casereader_read (reader, &c); + case_destroy (&c)) { - double weight = dict_get_case_weight (default_dict, c, &dsc->bad_warn); + double weight = dict_get_case_weight (default_dict, &c, &dsc->bad_warn); if (weight <= 0.0) - continue; + continue; /* Check for missing values. */ - if (listwise_missing (dsc, c)) + if (listwise_missing (dsc, &c)) { dsc->missing_listwise += weight; if (dsc->missing_type == DSC_LISTWISE) @@ -731,12 +736,12 @@ calc_descriptives (const struct casefile *cf, void *dsc_) for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; - double x = c->data[dv->v->fv].f; + double x = case_num (&c, dv->v->fv); if (dsc->missing_type != DSC_LISTWISE && (x == SYSMIS || (!dsc->include_user_missing - && is_num_user_missing (x, dv->v)))) + && mv_is_num_user_missing (&dv->v->miss, x)))) { dv->missing += weight; continue; @@ -756,28 +761,29 @@ calc_descriptives (const struct casefile *cf, void *dsc_) /* Second pass for higher-order moments. */ if (dsc->max_moment > MOMENT_MEAN) { - reader = casefile_get_reader (cf); - while (casereader_read (reader, &c)) + for (reader = casefile_get_reader (cf); + casereader_read (reader, &c); + case_destroy (&c)) { - double weight = dict_get_case_weight (default_dict, c, + double weight = dict_get_case_weight (default_dict, &c, &dsc->bad_warn); if (weight <= 0.0) continue; /* Check for missing values. */ - if (listwise_missing (dsc, c) + if (listwise_missing (dsc, &c) && dsc->missing_type == DSC_LISTWISE) continue; for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; - double x = c->data[dv->v->fv].f; + double x = case_num (&c, dv->v->fv); if (dsc->missing_type != DSC_LISTWISE && (x == SYSMIS || (!dsc->include_user_missing - && is_num_user_missing (x, dv->v)))) + && mv_is_num_user_missing (&dv->v->miss, x)))) continue; if (dv->moments != NULL) @@ -832,15 +838,16 @@ calc_descriptives (const struct casefile *cf, void *dsc_) static int listwise_missing (struct dsc_proc *dsc, const struct ccase *c) { - int i; + size_t i; for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; - double x = c->data[dv->v->fv].f; + double x = case_num (c, dv->v->fv); if (x == SYSMIS - || (!dsc->include_user_missing && is_num_user_missing (x, dv->v))) + || (!dsc->include_user_missing + && mv_is_num_user_missing (&dv->v->miss, x))) return 1; } return 0; @@ -854,7 +861,7 @@ static algo_compare_func descriptives_compare_dsc_vars; static void display (struct dsc_proc *dsc) { - int i, j; + size_t i; int nc; struct tab_table *t; @@ -895,6 +902,7 @@ display (struct dsc_proc *dsc) for (i = 0; i < dsc->var_cnt; i++) { struct dsc_var *dv = &dsc->vars[i]; + size_t j; nc = 0; tab_text (t, nc++, i + 1, TAB_LEFT, dv->v->name); @@ -924,7 +932,7 @@ descriptives_compare_dsc_vars (const void *a_, const void *b_, void *dsc_) int result; if (dsc->sort_by_stat == DSC_NAME) - result = strcmp (a->v->name, b->v->name); + result = strcasecmp (a->v->name, b->v->name); else { double as = a->stats[dsc->sort_by_stat];