X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fautorecode.c;h=f6ea46241634e3d9b0d8e14db119e7bdadd532fe;hb=047d4a8e14cdbb50258bf8c5634db24a88767f24;hp=b2c4d4844c5c6cd083b54f0055d5a204c72baa7c;hpb=6f3865480503c571963d8a2d1af858a4d72d4e88;p=pspp diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c index b2c4d4844c..f6ea462416 100644 --- a/src/language/stats/autorecode.c +++ b/src/language/stats/autorecode.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2012, 2013, 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 "data/case.h" @@ -59,7 +60,8 @@ struct arc_item /* Explains how to recode an AUTORECODE variable. */ struct arc_spec { - const struct variable *src; /* Source variable. */ + int width; /* Variable width. */ + int src_idx; /* Case index of source variable. */ struct variable *dst; /* Target variable. */ struct rec_items *items; }; @@ -89,7 +91,6 @@ struct autorecode_pgm struct rec_items *global_items; bool blank_valid; - const struct dictionary *dict; }; static trns_proc_func autorecode_trns_proc; @@ -145,18 +146,18 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) /* Create procedure. */ arc = xzalloc (sizeof *arc); arc->blank_valid = true; - arc->dict = dataset_dict (ds); /* Parse variable lists. */ lex_match_id (lexer, "VARIABLES"); lex_match (lexer, T_EQUALS); - if (!parse_variables_const (lexer, arc->dict, &src_vars, &n_srcs, - PV_NO_DUPLICATE)) + if (!parse_variables_const (lexer, dict, &src_vars, &n_srcs, + PV_NO_DUPLICATE | PV_NO_SCRATCH)) goto error; + lex_match (lexer, T_SLASH); if (!lex_force_match_id (lexer, "INTO")) goto error; lex_match (lexer, T_EQUALS); - if (!parse_DATA_LIST_vars (lexer, arc->dict, &dst_names, &n_dsts, + if (!parse_DATA_LIST_vars (lexer, dict, &dst_names, &n_dsts, PV_NO_DUPLICATE)) goto error; if (n_dsts != n_srcs) @@ -171,7 +172,7 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) { const char *name = dst_names[i]; - if (dict_lookup_var (arc->dict, name) != NULL) + if (dict_lookup_var (dict, name) != NULL) { msg (SE, _("Target variable %s duplicates existing variable %s."), name, name); @@ -226,7 +227,8 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) { struct arc_spec *spec = &arc->specs[i]; - spec->src = src_vars[i]; + spec->width = var_get_width (src_vars[i]); + spec->src_idx = var_get_case_index (src_vars[i]); if (arc->global_items) { @@ -248,15 +250,17 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) for (i = 0; i < arc->n_specs; i++) { struct arc_spec *spec = &arc->specs[i]; - int width = var_get_width (spec->src); - const union value *value = case_data (c, spec->src); + int width = spec->width; + const union value *value = case_data_idx (c, spec->src_idx); size_t hash = value_hash (value, width, 0); struct arc_item *item; item = find_arc_item (spec, value, hash); if ( (item == NULL) - && - ( arc->blank_valid || var_is_numeric (spec->src) || ! value_is_blank (value, width, arc->dict)) + && + ( arc->blank_valid + || val_type_from_width (spec->width) == VAL_NUMERIC + || ! value_is_blank (value, width, dict)) ) { item = xmalloc (sizeof *item); @@ -268,6 +272,10 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) ok = casereader_destroy (input); ok = proc_commit (ds) && ok; + /* Re-fetch dictionary because it might have changed (if TEMPORARY was in + use). */ + dict = dataset_dict (ds); + /* Create transformation. */ for (i = 0; i < arc->n_specs; i++) { @@ -297,13 +305,14 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) { const union value *from = &items[j]->from; char *recoded_value = NULL; - char *c; const int src_width = items[j]->width; union value to_val; + size_t len; + value_init (&to_val, 0); items[j]->to = direction == ASCENDING ? j + 1 : n_items - j; - + to_val.f = items[j]->to; /* Add value labels to the destination variable which indicate @@ -312,18 +321,16 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) { const char *str = CHAR_CAST_BUG (const char*, value_str (from, src_width)); - recoded_value = recode_string (UTF8, dict_get_encoding (arc->dict), str, src_width); + recoded_value = recode_string (UTF8, dict_get_encoding (dict), + str, src_width); } else - recoded_value = c_xasprintf ("%g", from->f); - + recoded_value = c_xasprintf ("%.*g", DBL_DIG + 1, from->f); + /* Remove trailing whitespace */ - for (c = recoded_value; *c != '\0'; c++) - if ( *c == ' ') - { - *c = '\0'; - break; - } + len = strlen (recoded_value); + while (len > 0 && recoded_value[len - 1] == ' ') + recoded_value[--len] = '\0'; var_add_value_label (spec->dst, &to_val, recoded_value); value_destroy (&to_val, 0); @@ -375,7 +382,7 @@ arc_free (struct autorecode_pgm *arc) for (i = 0; i < arc->n_specs; i++) { struct arc_spec *spec = &arc->specs[i]; - + if (--spec->items->refcnt == 0) { hmap_destroy (&spec->items->ht); @@ -388,7 +395,7 @@ arc_free (struct autorecode_pgm *arc) hmap_destroy (&arc->global_items->ht); free (arc->global_items); } - + free (arc->specs); free (arc); } @@ -401,7 +408,7 @@ find_arc_item (const struct arc_spec *spec, const union value *value, struct arc_item *item; HMAP_FOR_EACH_WITH_HASH (item, struct arc_item, hmap_node, hash, &spec->items->ht) - if (value_equal (value, &item->from, var_get_width (spec->src))) + if (value_equal (value, &item->from, spec->width)) return item; return NULL; } @@ -438,9 +445,9 @@ autorecode_trns_proc (void *arc_, struct ccase **c, for (i = 0; i < arc->n_specs; i++) { const struct arc_spec *spec = &arc->specs[i]; - int width = var_get_width (spec->src); - const union value *value = case_data (*c, spec->src); - const struct arc_item *item = find_arc_item (spec, value, value_hash (value, width, 0)); + const union value *value = case_data_idx (*c, spec->src_idx); + unsigned int hash = value_hash (value, spec->width, 0); + const struct arc_item *item = find_arc_item (spec, value, hash); case_data_rw (*c, spec->dst)->f = item ? item->to : SYSMIS; }