X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fflip.c;h=ccb84dd8a4f37abecb352a2bf04dc92f95b71602;hb=c1f796a012aa172cf44ed3cf386b0222fa12ab35;hp=9afcf422c5c0b12173109edf763f03c5302d59b8;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp-builds.git diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c index 9afcf422..ccb84dd8 100644 --- a/src/language/stats/flip.c +++ b/src/language/stats/flip.c @@ -21,9 +21,6 @@ #include #include #include -#ifdef HAVE_SYS_TYPES_H -#include -#endif #include #include @@ -31,12 +28,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -46,6 +43,7 @@ #include "intprops.h" #include "minmax.h" +#include "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -62,10 +60,8 @@ struct flip_pgm { struct pool *pool; /* Pool containing FLIP data. */ const struct variable **var; /* Variables to transpose. */ - int *idx_to_fv; /* var[]->index to compacted sink case fv. */ size_t var_cnt; /* Number of elements in `var'. */ int case_cnt; /* Pre-flip case count. */ - size_t case_size; /* Post-flip bytes per case. */ struct variable *new_names; /* Variable containing new variable names. */ struct varname *new_names_head; /* First new variable. */ @@ -102,8 +98,6 @@ cmd_flip (struct lexer *lexer, struct dataset *ds) flip = pool_create_container (struct flip_pgm, pool); flip->var = NULL; - flip->idx_to_fv = dict_get_compacted_dict_index_to_case_index (dict); - pool_register (flip->pool, free, flip->idx_to_fv); flip->var_cnt = 0; flip->case_cnt = 0; flip->new_names = NULL; @@ -119,12 +113,12 @@ cmd_flip (struct lexer *lexer, struct dataset *ds) { lex_match (lexer, '='); if (!parse_variables_const (lexer, dict, &flip->var, &flip->var_cnt, - PV_NO_DUPLICATE)) + PV_NO_DUPLICATE)) goto error; lex_match (lexer, '/'); } else - dict_get_vars (dict, &flip->var, &flip->var_cnt, 1u << DC_SYSTEM); + dict_get_vars (dict, &flip->var, &flip->var_cnt, DC_SYSTEM); pool_register (flip->pool, free, flip->var); lex_match (lexer, '/'); @@ -149,8 +143,7 @@ cmd_flip (struct lexer *lexer, struct dataset *ds) } } - output_buf = pool_nalloc (flip->pool, - flip->var_cnt, sizeof *output_buf); + output_buf = pool_nalloc (flip->pool, flip->var_cnt, sizeof *output_buf); flip->file = pool_tmpfile (flip->pool); if (flip->file == NULL) @@ -173,7 +166,6 @@ cmd_flip (struct lexer *lexer, struct dataset *ds) flip->case_cnt = 1; /* Read the active file into a flip_sink. */ - proc_make_temporary_transformations_permanent (ds); proc_discard_output (ds); input = proc_open (ds); @@ -199,11 +191,10 @@ cmd_flip (struct lexer *lexer, struct dataset *ds) proc_discard_active_file (ds); goto error; } - flip->case_size = dict_get_case_size (dict); /* Set up flipped data for reading. */ reader = casereader_create_sequential (NULL, dict_get_next_value_idx (dict), - flip->case_cnt, + flip->var_cnt, &flip_casereader_class, flip); proc_set_active_file_data (ds, reader); return lex_end_of_command (lexer); @@ -288,7 +279,7 @@ build_dictionary (struct dictionary *dict, struct flip_pgm *flip) return false; } - for (i = 0; i < flip->case_cnt; i++) + for (i = 0; i < flip->case_cnt - 1; i++) { struct variable *v; char s[SHORT_NAME_LEN + 1]; @@ -321,11 +312,10 @@ write_flip_case (struct flip_pgm *flip, const struct ccase *c) if (flip->new_names != NULL) { struct varname *v = pool_alloc (flip->pool, sizeof *v); - int fv = flip->idx_to_fv[var_get_dict_index (flip->new_names)]; v->next = NULL; if (var_is_numeric (flip->new_names)) { - double f = case_num_idx (c, fv); + double f = case_num (c, flip->new_names); if (f == SYSMIS) strcpy (v->name, "VSYSMIS"); @@ -339,7 +329,7 @@ write_flip_case (struct flip_pgm *flip, const struct ccase *c) else { int width = MIN (var_get_width (flip->new_names), MAX_SHORT_STRING); - memcpy (v->name, case_str_idx (c, fv), width); + memcpy (v->name, case_str (c, flip->new_names), width); v->name[width] = 0; } @@ -353,15 +343,8 @@ write_flip_case (struct flip_pgm *flip, const struct ccase *c) /* Write to external file. */ for (i = 0; i < flip->var_cnt; i++) { - double out; - - if (var_is_numeric (flip->var[i])) - { - int fv = flip->idx_to_fv[var_get_dict_index (flip->var[i])]; - out = case_num_idx (c, fv); - } - else - out = SYSMIS; + const struct variable *v = flip->var[i]; + double out = var_is_numeric (v) ? case_num (c, v) : SYSMIS; fwrite (&out, sizeof out, 1, flip->file); } return true; @@ -379,7 +362,7 @@ flip_file (struct flip_pgm *flip) /* Allocate memory for many cases. */ case_bytes = flip->var_cnt * sizeof *input_buf; - case_capacity = get_workspace () / case_bytes; + case_capacity = settings_get_workspace () / case_bytes; if (case_capacity > flip->case_cnt * 2) case_capacity = flip->case_cnt * 2; if (case_capacity < 2) @@ -441,14 +424,6 @@ flip_file (struct flip_pgm *flip) for (j = 0; j < read_cases; j++) output_buf[j] = input_buf[i + j * flip->var_cnt]; -#ifndef HAVE_FSEEKO -#define fseeko fseek -#endif - -#ifndef HAVE_OFF_T -#define off_t long int -#endif - if (fseeko (output_file, sizeof *input_buf * (case_idx + (off_t) i * flip->case_cnt),