X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Frank.c;h=dd3bea12832cf11887e28983932369454c0a838b;hb=6f763403034b44b809fae1580dda3af0ab24a11b;hp=2fcf636d9ef0977004c41dd1833fe18200926d50;hpb=7e79eed6a7d671c9a522be77cc90f37d498b9b11;p=pspp diff --git a/src/language/stats/rank.c b/src/language/stats/rank.c index 2fcf636d9e..dd3bea1283 100644 --- a/src/language/stats/rank.c +++ b/src/language/stats/rank.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc + Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2012, 2013, 2014, 2016 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,9 @@ #include +#include +#include + #include "data/case.h" #include "data/casegrouper.h" #include "data/casereader.h" @@ -26,27 +29,21 @@ #include "data/subcase.h" #include "data/casewriter.h" #include "data/short-names.h" - #include "language/command.h" #include "language/lexer/lexer.h" #include "language/lexer/variable-parser.h" #include "language/stats/sort-criteria.h" - #include "math/sort.h" - #include "libpspp/assertion.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" #include "libpspp/misc.h" -#include "libpspp/taint.h" #include "libpspp/pool.h" -#include "libpspp/message.h" - +#include "libpspp/string-set.h" +#include "libpspp/taint.h" #include "output/tab.h" -#include - -#include - #include "gettext.h" #define _(msgid) gettext (msgid) #define N_(msgid) (msgid) @@ -147,70 +144,69 @@ enum fraction struct rank_spec { enum rank_func rfunc; - struct variable **destvars; + const char **dest_names; + const char **dest_labels; }; - -/* Create and return a new variable in which to store the ranks of SRC_VAR - accoring to the rank function F. - VNAME is the name of the variable to be created. - If VNAME is NULL, then a name will be automatically chosen. -*/ -static struct variable * -create_rank_variable (struct dictionary *dict, enum rank_func f, - const struct variable *src_var, - const char *vname) +/* If NEW_NAME exists in DICT or NEW_NAMES, returns NULL without changing + anything. Otherwise, inserts NEW_NAME in NEW_NAMES and returns the copy of + NEW_NAME now in NEW_NAMES. */ +static const char * +try_new_name (const char *new_name, + const struct dictionary *dict, struct string_set *new_names) { - int i; - struct variable *var = NULL; - char name[SHORT_NAME_LEN + 1]; + return (!dict_lookup_var (dict, new_name) + && string_set_insert (new_names, new_name) + ? string_set_find_node (new_names, new_name)->string + : NULL); +} - if ( vname ) - var = dict_create_var(dict, vname, 0); +/* Returns a variable name for storing ranks of a variable named SRC_NAME + accoring to the rank function F. The name chosen will not be one already in + DICT or NEW_NAMES. - if ( NULL == var ) - { - snprintf (name, SHORT_NAME_LEN + 1, "%c%s", - function_name[f][0], var_get_name (src_var)); - - var = dict_create_var(dict, name, 0); - } - i = 1; - while( NULL == var ) - { - char func_abb[4]; - snprintf(func_abb, 4, "%s", function_name[f]); - snprintf(name, SHORT_NAME_LEN + 1, "%s%03d", func_abb, - i); - - var = dict_create_var(dict, name, 0); - if (i++ >= 999) - break; - } + If successful, adds the new name to NEW_NAMES and returns the name added. + If no name can be generated, returns NULL. */ +static const char * +rank_choose_dest_name (struct dictionary *dict, struct string_set *new_names, + enum rank_func f, const char *src_name) +{ + char *src_name_7; + char name[128]; + const char *s; + int i; - i = 1; - while ( NULL == var ) + /* Try the first character of the ranking function followed by the first 7 + bytes of the srcinal variable name. */ + src_name_7 = utf8_encoding_trunc (src_name, dict_get_encoding (dict), 7); + snprintf (name, sizeof name, "%c%s", function_name[f][0], src_name_7); + free (src_name_7); + s = try_new_name (name, dict, new_names); + if (s != NULL) + return s; + + /* Try "fun###". */ + for (i = 1; i <= 999; i++) { - char func_abb[3]; - snprintf(func_abb, 3, "%s", function_name[f]); - - snprintf(name, SHORT_NAME_LEN + 1, - "RNK%s%02d", func_abb, i); - - var = dict_create_var(dict, name, 0); - if ( i++ >= 99 ) - break; + sprintf (name, "%.3s%03d", function_name[f], i); + s = try_new_name (name, dict, new_names); + if (s != NULL) + return s; } - if ( NULL == var ) + /* Try "RNKfn##". */ + for (i = 1; i <= 99; i++) { - msg(ME, _("Cannot create new rank variable. All candidates in use.")); - return NULL; + sprintf (name, "RNK%.2s%02d", function_name[f], i); + s = try_new_name (name, dict, new_names); + if (s != NULL) + return s; } - var_set_both_formats (var, &dest_format[f]); - - return var; + msg (ME, _("Cannot generate variable name for ranking %s with %s. " + "All candidates in use."), + src_name, function_name[f]); + return NULL; } struct rank @@ -253,7 +249,8 @@ destroy_rank (struct rank *rank) } static bool -parse_into (struct lexer *lexer, struct rank *cmd) +parse_into (struct lexer *lexer, struct rank *cmd, + struct string_set *new_names) { int var_count = 0; struct rank_spec *rs = NULL; @@ -307,34 +304,37 @@ parse_into (struct lexer *lexer, struct rank *cmd) } else { + lex_error (lexer, NULL); return false; } cmd->n_rs++; - rs->destvars = NULL; - rs->destvars = pool_calloc (cmd->pool, cmd->n_vars, sizeof (*rs->destvars)); + rs->dest_names = pool_calloc (cmd->pool, cmd->n_vars, + sizeof *rs->dest_names); if (lex_match_id (lexer, "INTO")) { while( lex_token (lexer) == T_ID ) { const char *name = lex_tokcstr (lexer); - if ( dict_lookup_var (cmd->dict, name) != NULL ) - { - msg (SE, _("Variable %s already exists."), name); - return false; - } - + if ( var_count >= subcase_get_n_fields (&cmd->sc) ) - { - msg (SE, _("Too many variables in INTO clause.")); - return false; - } - rs->destvars[var_count] = - create_rank_variable (cmd->dict, rs->rfunc, cmd->vars[var_count], name); - ++var_count; - lex_get (lexer); - } + msg (SE, _("Too many variables in %s clause."), "INTO"); + else if ( dict_lookup_var (cmd->dict, name) != NULL ) + msg (SE, _("Variable %s already exists."), name); + else if (string_set_contains (new_names, name)) + msg (SE, _("Duplicate variable name %s."), name); + else + { + string_set_insert (new_names, name); + rs->dest_names[var_count++] = pool_strdup (cmd->pool, name); + lex_get (lexer); + continue; + } + + /* Error path. */ + return false; + } } return true; @@ -515,118 +515,105 @@ rank_savage (const struct rank *cmd UNUSED, double c, double cc, double cc_1, NOT_REACHED(); } +static double +sum_weights (const struct casereader *input, int weight_idx) +{ + if (weight_idx == -1) + return casereader_count_cases (input); + else + { + struct casereader *pass; + struct ccase *c; + double w; + + w = 0.0; + pass = casereader_clone (input); + for (; (c = casereader_read (pass)) != NULL; case_unref (c)) + w += case_num_idx (c, weight_idx); + casereader_destroy (pass); + + return w; + } +} static void rank_sorted_file (struct casereader *input, struct casewriter *output, - const struct dictionary *dict, - int dest_idx, - const struct rank *cmd - ) + int weight_idx, + const struct rank *cmd) { - struct casereader *pass1, *pass2, *pass2_1; struct casegrouper *tie_grouper; + struct casereader *tied_cases; + struct subcase input_var; + int tie_group = 1; struct ccase *c; - double w = 0.0; double cc = 0.0; - int tie_group = 1; - - input = casereader_create_filter_missing (input, &cmd->vars[dest_idx], 1, - cmd->exclude, NULL, output); - input = casereader_create_filter_weight (input, dict, NULL, output); - - casereader_split (input, &pass1, &pass2); + double w; - /* Pass 1: Get total group weight. */ - for (; (c = casereader_read (pass1)) != NULL; case_unref (c)) - w += dict_get_case_weight (dict, c, NULL); - casereader_destroy (pass1); + /* Get total group weight. */ + w = sum_weights (input, weight_idx); - /* Pass 2: Do ranking. */ - tie_grouper = casegrouper_create_vars (pass2, &cmd->vars[dest_idx], 1); - while (casegrouper_get_next_group (tie_grouper, &pass2_1)) + /* Do ranking. */ + subcase_init (&input_var, 0, 0, SC_ASCEND); + tie_grouper = casegrouper_create_subcase (input, &input_var); + subcase_destroy (&input_var); + for (; casegrouper_get_next_group (tie_grouper, &tied_cases); + casereader_destroy (tied_cases)) { - struct casereader *pass2_2; + double tw = sum_weights (tied_cases, weight_idx); double cc_1 = cc; - double tw = 0.0; - int i; + cc += tw; - pass2_2 = casereader_clone (pass2_1); - taint_propagate (casereader_get_taint (pass2_2), + taint_propagate (casereader_get_taint (tied_cases), casewriter_get_taint (output)); - /* Pass 2.1: Sum up weight for tied cases. */ - for (; (c = casereader_read (pass2_1)) != NULL; case_unref (c)) - tw += dict_get_case_weight (dict, c, NULL); - cc += tw; - casereader_destroy (pass2_1); - - /* Pass 2.2: Rank tied cases. */ - while ((c = casereader_read (pass2_2)) != NULL) + /* Rank tied cases. */ + for (; (c = casereader_read (tied_cases)) != NULL; case_unref (c)) { - c = case_unshare (c); + struct ccase *out_case; + size_t i; + + out_case = case_create (casewriter_get_proto (output)); + case_data_rw_idx (out_case, 0)->f = case_num_idx (c, 1); for (i = 0; i < cmd->n_rs; ++i) { - const struct variable *dst_var = cmd->rs[i].destvars[dest_idx]; - double *dst_value = &case_data_rw (c, dst_var)->f; - *dst_value = rank_func[cmd->rs[i].rfunc] (cmd, tw, cc, cc_1, tie_group, w); + rank_function_t func = rank_func[cmd->rs[i].rfunc]; + double rank = func (cmd, tw, cc, cc_1, tie_group, w); + case_data_rw_idx (out_case, i + 1)->f = rank; } - casewriter_write (output, c); - } - casereader_destroy (pass2_2); + casewriter_write (output, out_case); + } tie_group++; } casegrouper_destroy (tie_grouper); } -/* Transformation function to enumerate all the cases */ -static int -create_resort_key (void *key_var_, struct ccase **cc, casenumber case_num) -{ - struct variable *key_var = key_var_; - - *cc = case_unshare (*cc); - case_data_rw (*cc, key_var)->f = case_num; - - return TRNS_CONTINUE; -} - static bool rank_cmd (struct dataset *ds, const struct rank *cmd); - static const char * fraction_name (const struct rank *cmd) { - static char name[10]; switch (cmd->fraction ) { - case FRAC_BLOM: - strcpy (name, "BLOM"); - break; - case FRAC_RANKIT: - strcpy (name, "RANKIT"); - break; - case FRAC_TUKEY: - strcpy (name, "TUKEY"); - break; - case FRAC_VW: - strcpy (name, "VW"); - break; - default: - NOT_REACHED (); + case FRAC_BLOM: return "BLOM"; + case FRAC_RANKIT: return "RANKIT"; + case FRAC_TUKEY: return "TUKEY"; + case FRAC_VW: return "VW"; + default: NOT_REACHED (); } - return name; } -/* Create a label on DEST_VAR, describing its derivation from SRC_VAR and F */ -static void -create_var_label (struct rank *cmd, struct variable *dest_var, - const struct variable *src_var, enum rank_func f) +/* Returns a label for a variable derived from SRC_VAR with function F. */ +static const char * +create_var_label (struct rank *cmd, const struct variable *src_var, + enum rank_func f) { struct string label; + const char *pool_label; + ds_init_empty (&label); if ( cmd->n_group_vars > 0 ) @@ -650,17 +637,19 @@ create_var_label (struct rank *cmd, struct variable *dest_var, ds_put_format (&label, _("%s of %s"), function_name[f], var_get_name (src_var)); - var_set_label (dest_var, ds_cstr (&label), false); + pool_label = pool_strdup (cmd->pool, ds_cstr (&label)); ds_destroy (&label); + + return pool_label; } int cmd_rank (struct lexer *lexer, struct dataset *ds) { + struct string_set new_names; struct rank rank; - struct variable *order; - bool result = true; + struct rank_spec *rs; int i; subcase_init_empty (&rank.sc); @@ -676,6 +665,8 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) rank.print = true; rank.pool = pool_create (); + string_set_init (&new_names); + if (lex_match_id (lexer, "VARIABLES")) lex_force_match (lexer, T_EQUALS); @@ -782,7 +773,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) goto error; } } - else if (! parse_into (lexer, &rank)) + else if (! parse_into (lexer, &rank, &new_names)) goto error; } @@ -790,40 +781,47 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) /* If no rank specs are given, then apply a default */ if ( rank.n_rs == 0) { - rank.rs = pool_calloc (rank.pool, 1, sizeof (*rank.rs)); + struct rank_spec *rs; + + rs = pool_calloc (rank.pool, 1, sizeof *rs); + rs->rfunc = RANK; + rs->dest_names = pool_calloc (rank.pool, rank.n_vars, + sizeof *rs->dest_names); + + rank.rs = rs; rank.n_rs = 1; - rank.rs[0].rfunc = RANK; - rank.rs[0].destvars = pool_calloc (rank.pool, rank.n_vars, sizeof (*rank.rs[0].destvars)); } - /* Create variables for all rank destinations which haven't - already been created with INTO. - Add labels to all the destination variables. - */ - for (i = 0 ; i < rank.n_rs ; ++i ) + /* Choose variable names for all rank destinations which haven't already been + created with INTO. */ + for (rs = rank.rs; rs < &rank.rs[rank.n_rs]; rs++) { int v; - struct rank_spec *rs = &rank.rs[i]; + rs->dest_labels = pool_calloc (rank.pool, rank.n_vars, + sizeof *rs->dest_labels); for ( v = 0 ; v < rank.n_vars ; v ++ ) - { - if ( rs->destvars[v] == NULL ) - { - rs->destvars[v] = - create_rank_variable (rank.dict, rs->rfunc, rank.vars[v], NULL); - } + { + const char **dst_name = &rs->dest_names[v]; + if ( *dst_name == NULL ) + { + *dst_name = rank_choose_dest_name (rank.dict, &new_names, + rs->rfunc, + var_get_name (rank.vars[v])); + if (*dst_name == NULL) + goto error; + } - create_var_label (&rank, rs->destvars[v], - rank.vars[v], - rs->rfunc); - } + rs->dest_labels[v] = create_var_label (&rank, rank.vars[v], + rs->rfunc); + } } if ( rank.print ) { int v; - tab_output_text (0, _("Variables Created By RANK")); + tab_output_text_format (0, _("Variables Created By %s"), "RANK"); tab_output_text (0, ""); for (i = 0 ; i < rank.n_rs ; ++i ) @@ -849,7 +847,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) tab_output_text_format (0, _("%s into %s(%s of %s using %s BY %s)"), var_get_name (rank.vars[v]), - var_get_name (rank.rs[i].destvars[v]), + rank.rs[i].dest_names[v], function_name[rank.rs[i].rfunc], var_get_name (rank.vars[v]), fraction_name (&rank), @@ -859,7 +857,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) tab_output_text_format (0, _("%s into %s(%s of %s BY %s)"), var_get_name (rank.vars[v]), - var_get_name (rank.rs[i].destvars[v]), + rank.rs[i].dest_names[v], function_name[rank.rs[i].rfunc], var_get_name (rank.vars[v]), ds_cstr (&varlist)); @@ -872,7 +870,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) tab_output_text_format (0, _("%s into %s(%s of %s using %s)"), var_get_name (rank.vars[v]), - var_get_name (rank.rs[i].destvars[v]), + rank.rs[i].dest_names[v], function_name[rank.rs[i].rfunc], var_get_name (rank.vars[v]), fraction_name (&rank)); @@ -881,7 +879,7 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) tab_output_text_format (0, _("%s into %s(%s of %s)"), var_get_name (rank.vars[v]), - var_get_name (rank.rs[i].destvars[v]), + rank.rs[i].dest_names[v], function_name[rank.rs[i].rfunc], var_get_name (rank.vars[v])); } @@ -889,97 +887,254 @@ cmd_rank (struct lexer *lexer, struct dataset *ds) } } - /* Add a variable which we can sort by to get back the original - order */ - order = dict_create_var_assert (dataset_dict (ds), "$ORDER_", 0); - - add_transformation (ds, create_resort_key, 0, order); - /* Do the ranking */ - result = rank_cmd (ds, &rank); - - /* Put the active dataset back in its original order. Delete - our sort key, which we don't need anymore. */ - { - struct casereader *sorted; - - - /* FIXME: loses error conditions. */ - - proc_discard_output (ds); - sorted = sort_execute_1var (proc_open (ds), order); - result = proc_commit (ds) && result; - - dict_delete_var (dataset_dict (ds), order); - result = dataset_set_source (ds, sorted) && result; - if ( result != true) - goto error; - } + rank_cmd (ds, &rank); destroy_rank (&rank); + string_set_destroy (&new_names); return CMD_SUCCESS; error: destroy_rank (&rank); + string_set_destroy (&new_names); return CMD_FAILURE; } +/* RANK transformation. */ +struct rank_trns + { + int order_case_idx; + + struct rank_trns_input_var *input_vars; + size_t n_input_vars; + + size_t n_funcs; + }; + +struct rank_trns_input_var + { + struct casereader *input; + struct ccase *current; + + struct variable **output_vars; + }; + +static void +advance_ranking (struct rank_trns_input_var *iv) +{ + case_unref (iv->current); + iv->current = casereader_read (iv->input); +} + +static int +rank_trns_proc (void *trns_, struct ccase **c, casenumber case_idx UNUSED) +{ + struct rank_trns *trns = trns_; + double order = case_num_idx (*c, trns->order_case_idx); + struct rank_trns_input_var *iv; + + *c = case_unshare (*c); + for (iv = trns->input_vars; iv < &trns->input_vars[trns->n_input_vars]; iv++) + while (iv->current != NULL) + { + double iv_order = case_num_idx (iv->current, 0); + if (iv_order == order) + { + size_t i; + + for (i = 0; i < trns->n_funcs; i++) + case_data_rw (*c, iv->output_vars[i])->f + = case_num_idx (iv->current, i + 1); + advance_ranking (iv); + break; + } + else if (iv_order > order) + break; + else + advance_ranking (iv); + } + return TRNS_CONTINUE; +} + +static bool +rank_trns_free (void *trns_) +{ + struct rank_trns *trns = trns_; + struct rank_trns_input_var *iv; + for (iv = trns->input_vars; iv < &trns->input_vars[trns->n_input_vars]; iv++) + { + casereader_destroy (iv->input); + case_unref (iv->current); + + free (iv->output_vars); + } + free (trns->input_vars); + free (trns); + + return true; +} static bool rank_cmd (struct dataset *ds, const struct rank *cmd) { struct dictionary *d = dataset_dict (ds); + struct variable *weight_var = dict_get_weight (d); + struct casewriter **outputs; + struct variable *order_var; + struct casereader *input; + struct rank_trns *trns; bool ok = true; int i; - for (i = 0 ; i < subcase_get_n_fields (&cmd->sc) ; ++i ) + order_var = add_permanent_ordering_transformation (ds); + + /* Create output files. */ + { + struct caseproto *output_proto; + struct subcase by_order; + + output_proto = caseproto_create (); + for (i = 0; i < cmd->n_rs + 1; i++) + output_proto = caseproto_add_width (output_proto, 0); + + subcase_init (&by_order, 0, 0, SC_ASCEND); + + outputs = xnmalloc (cmd->n_vars, sizeof *outputs); + for (i = 0; i < cmd->n_vars; i++) + outputs[i] = sort_create_writer (&by_order, output_proto); + + subcase_destroy (&by_order); + caseproto_unref (output_proto); + } + + /* Open the active file and make one pass per input variable. */ + input = proc_open (ds); + input = casereader_create_filter_weight (input, d, NULL, NULL); + for (i = 0 ; i < cmd->n_vars ; ++i ) { - /* Rank variable at index I in SC. */ + const struct variable *input_var = cmd->vars[i]; + struct casereader *input_pass; struct casegrouper *split_grouper; struct casereader *split_group; - struct casewriter *output; - - proc_discard_output (ds); - split_grouper = casegrouper_create_splits (proc_open (ds), d); - output = autopaging_writer_create (dict_get_proto (d)); + struct subcase rank_ordering; + struct subcase projection; + struct subcase split_vars; + struct subcase group_vars; + int weight_idx; + int j; + /* Discard cases that have missing values of input variable. */ + input_pass = i == cmd->n_vars - 1 ? input : casereader_clone (input); + input_pass = casereader_create_filter_missing (input_pass, &input_var, 1, + cmd->exclude, NULL, NULL); + + /* Keep only the columns we really need, to save time and space when we + sort them just below. + + After this projection, the input_pass case indexes look like: + + - 0: input_var. + - 1: order_var. + - 2 and up: cmd->n_group_vars group variables + - 2 + cmd->n_group_vars and up: split variables + - 2 + cmd->n_group_vars + n_split_vars: weight var + */ + subcase_init_empty (&projection); + subcase_add_var_always (&projection, input_var, SC_ASCEND); + subcase_add_var_always (&projection, order_var, SC_ASCEND); + subcase_add_vars_always (&projection, + cmd->group_vars, cmd->n_group_vars); + subcase_add_vars_always (&projection, dict_get_split_vars (d), + dict_get_split_cnt (d)); + if (weight_var != NULL) + { + subcase_add_var_always (&projection, weight_var, SC_ASCEND); + weight_idx = 2 + cmd->n_group_vars + dict_get_split_cnt (d); + } + else + weight_idx = -1; + input_pass = casereader_project (input_pass, &projection); + subcase_destroy (&projection); + + /* Prepare 'group_vars' as the set of grouping variables. */ + subcase_init_empty (&group_vars); + for (j = 0; j < cmd->n_group_vars; j++) + subcase_add_always (&group_vars, + j + 2, var_get_width (cmd->group_vars[j]), + SC_ASCEND); + + /* Prepare 'rank_ordering' for sorting with the group variables as + primary key and the input variable as secondary key. */ + subcase_clone (&rank_ordering, &group_vars); + subcase_add (&rank_ordering, 0, 0, subcase_get_direction (&cmd->sc, i)); + + /* Group by split variables */ + subcase_init_empty (&split_vars); + for (j = 0; j < dict_get_split_cnt (d); j++) + subcase_add_always (&split_vars, 2 + j + cmd->n_group_vars, + var_get_width (dict_get_split_vars (d)[j]), + SC_ASCEND); + split_grouper = casegrouper_create_subcase (input_pass, &split_vars); + subcase_destroy (&split_vars); while (casegrouper_get_next_group (split_grouper, &split_group)) { - struct subcase ordering; struct casereader *ordered; struct casegrouper *by_grouper; struct casereader *by_group; - /* Sort this split group by the BY variables as primary - keys and the rank variable as secondary key. */ - subcase_init_vars (&ordering, cmd->group_vars, cmd->n_group_vars); - subcase_add_var (&ordering, cmd->vars[i], - subcase_get_direction (&cmd->sc, i)); - ordered = sort_execute (split_group, &ordering); - subcase_destroy (&ordering); - - /* Rank the rank variable within this split group. */ - by_grouper = casegrouper_create_vars (ordered, - cmd->group_vars, cmd->n_group_vars); + ordered = sort_execute (split_group, &rank_ordering); + by_grouper = casegrouper_create_subcase (ordered, &group_vars); while (casegrouper_get_next_group (by_grouper, &by_group)) - { - /* Rank the rank variable within this BY group - within the split group. */ + rank_sorted_file (by_group, outputs[i], weight_idx, cmd); + ok = casegrouper_destroy (by_grouper) && ok; + } + subcase_destroy (&group_vars); + subcase_destroy (&rank_ordering); - rank_sorted_file (by_group, output, d, i, cmd); + ok = casegrouper_destroy (split_grouper) && ok; + } + ok = proc_commit (ds) && ok; + + /* Re-fetch the dictionary and order variable, because if TEMPORARY was in + effect then there's a new dictionary. */ + d = dataset_dict (ds); + order_var = dict_lookup_var_assert (d, "$ORDER"); + + /* Merge the original data set with the ranks (which we already sorted on + $ORDER). */ + trns = xmalloc (sizeof *trns); + trns->order_case_idx = var_get_case_index (order_var); + trns->input_vars = xnmalloc (cmd->n_vars, sizeof *trns->input_vars); + trns->n_input_vars = cmd->n_vars; + trns->n_funcs = cmd->n_rs; + for (i = 0; i < trns->n_input_vars; i++) + { + struct rank_trns_input_var *iv = &trns->input_vars[i]; + int j; - } - ok = casegrouper_destroy (by_grouper) && ok; + iv->input = casewriter_make_reader (outputs[i]); + iv->current = casereader_read (iv->input); + iv->output_vars = xnmalloc (trns->n_funcs, sizeof *iv->output_vars); + for (j = 0; j < trns->n_funcs; j++) + { + struct rank_spec *rs = &cmd->rs[j]; + struct variable *var; + + var = dict_create_var_assert (d, rs->dest_names[i], 0); + var_set_both_formats (var, &dest_format[rs->rfunc]); + var_set_label (var, rs->dest_labels[i]); + + iv->output_vars[j] = var; } - ok = casegrouper_destroy (split_grouper); - ok = proc_commit (ds) && ok; - ok = (dataset_set_source (ds, casewriter_make_reader (output)) - && ok); - if (!ok) - break; } + free (outputs); + + add_transformation (ds, rank_trns_proc, rank_trns_free, trns); + + /* Delete our sort key, which we don't need anymore. */ + dict_delete_var (d, order_var); return ok; }