X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fcrosstabs.q;h=f75e249e8fdd3bba0363a9a26240aedd30ad16e3;hb=608b1765241e7c6f9bd5e86a8f81cf15edeb413b;hp=fcc8dd12c67a2374735625fc421fa6ef07a0451f;hpb=6bdd39d0747913e5c5d8b0924cd1fe31c5a2808b;p=pspp diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q index fcc8dd12c6..f75e249e8f 100644 --- a/src/language/stats/crosstabs.q +++ b/src/language/stats/crosstabs.q @@ -200,41 +200,6 @@ struct crosstabs_proc unsigned int statistics; /* Bit k is 1 if statistic k is requested. */ }; -static void -init_proc (struct crosstabs_proc *proc, struct dataset *ds) -{ - const struct variable *wv = dict_get_weight (dataset_dict (ds)); - proc->dict = dataset_dict (ds); - proc->bad_warn = true; - proc->variables = NULL; - proc->n_variables = 0; - proc->pivots = NULL; - proc->n_pivots = 0; - proc->weight_format = wv ? *var_get_print_format (wv) : F_8_0; -} - -static void -free_proc (struct crosstabs_proc *proc) -{ - struct pivot_table *pt; - - free (proc->variables); - for (pt = &proc->pivots[0]; pt < &proc->pivots[proc->n_pivots]; pt++) - { - free (pt->vars); - free (pt->const_vars); - /* We must not call value_destroy on const_values because - it is a wild pointer; it never pointed to anything owned - by the pivot_table. - - The rest of the data was allocated and destroyed at a - lower level already. */ - } - free (proc->pivots); -} - -static int internal_cmd_crosstabs (struct lexer *lexer, struct dataset *ds, - struct crosstabs_proc *); static bool should_tabulate_case (const struct pivot_table *, const struct ccase *, enum mv_class exclude); static void tabulate_general_case (struct pivot_table *, const struct ccase *, @@ -244,91 +209,90 @@ static void tabulate_integer_case (struct pivot_table *, const struct ccase *, static void postcalc (struct crosstabs_proc *); static void submit (struct pivot_table *, struct tab_table *); -/* Parse and execute CROSSTABS, then clean up. */ +/* Parses and executes the CROSSTABS procedure. */ int cmd_crosstabs (struct lexer *lexer, struct dataset *ds) { + const struct variable *wv = dict_get_weight (dataset_dict (ds)); struct crosstabs_proc proc; - int result; - - init_proc (&proc, ds); - result = internal_cmd_crosstabs (lexer, ds, &proc); - free_proc (&proc); - - return result; -} - -/* Parses and executes the CROSSTABS procedure. */ -static int -internal_cmd_crosstabs (struct lexer *lexer, struct dataset *ds, - struct crosstabs_proc *proc) -{ struct casegrouper *grouper; struct casereader *input, *group; struct cmd_crosstabs cmd; struct pivot_table *pt; + int result; bool ok; int i; - if (!parse_crosstabs (lexer, ds, &cmd, proc)) - return CMD_FAILURE; + proc.dict = dataset_dict (ds); + proc.bad_warn = true; + proc.variables = NULL; + proc.n_variables = 0; + proc.pivots = NULL; + proc.n_pivots = 0; + proc.weight_format = wv ? *var_get_print_format (wv) : F_8_0; + + if (!parse_crosstabs (lexer, ds, &cmd, &proc)) + { + result = CMD_FAILURE; + goto exit; + } - proc->mode = proc->n_variables ? INTEGER : GENERAL; + proc.mode = proc.n_variables ? INTEGER : GENERAL; /* CELLS. */ if (!cmd.sbc_cells) - proc->cells = 1u << CRS_CL_COUNT; + proc.cells = 1u << CRS_CL_COUNT; else if (cmd.a_cells[CRS_CL_ALL]) - proc->cells = UINT_MAX; + proc.cells = UINT_MAX; else { - proc->cells = 0; + proc.cells = 0; for (i = 0; i < CRS_CL_count; i++) if (cmd.a_cells[i]) - proc->cells |= 1u << i; - if (proc->cells == 0) - proc->cells = ((1u << CRS_CL_COUNT) + proc.cells |= 1u << i; + if (proc.cells == 0) + proc.cells = ((1u << CRS_CL_COUNT) | (1u << CRS_CL_ROW) | (1u << CRS_CL_COLUMN) | (1u << CRS_CL_TOTAL)); } - proc->cells &= ((1u << CRS_CL_count) - 1); - proc->cells &= ~((1u << CRS_CL_NONE) | (1u << CRS_CL_ALL)); - proc->n_cells = 0; + proc.cells &= ((1u << CRS_CL_count) - 1); + proc.cells &= ~((1u << CRS_CL_NONE) | (1u << CRS_CL_ALL)); + proc.n_cells = 0; for (i = 0; i < CRS_CL_count; i++) - if (proc->cells & (1u << i)) - proc->a_cells[proc->n_cells++] = i; + if (proc.cells & (1u << i)) + proc.a_cells[proc.n_cells++] = i; /* STATISTICS. */ if (cmd.a_statistics[CRS_ST_ALL]) - proc->statistics = UINT_MAX; + proc.statistics = UINT_MAX; else if (cmd.sbc_statistics) { int i; - proc->statistics = 0; + proc.statistics = 0; for (i = 0; i < CRS_ST_count; i++) if (cmd.a_statistics[i]) - proc->statistics |= 1u << i; - if (proc->statistics == 0) - proc->statistics |= 1u << CRS_ST_CHISQ; + proc.statistics |= 1u << i; + if (proc.statistics == 0) + proc.statistics |= 1u << CRS_ST_CHISQ; } else - proc->statistics = 0; + proc.statistics = 0; /* MISSING. */ - proc->exclude = (cmd.miss == CRS_TABLE ? MV_ANY + proc.exclude = (cmd.miss == CRS_TABLE ? MV_ANY : cmd.miss == CRS_INCLUDE ? MV_SYSTEM : MV_NEVER); - if (proc->mode == GENERAL && proc->mode == MV_NEVER) + if (proc.mode == GENERAL && proc.mode == MV_NEVER) { msg (SE, _("Missing mode REPORT not allowed in general mode. " "Assuming MISSING=TABLE.")); - proc->mode = MV_ANY; + proc.mode = MV_ANY; } /* PIVOT. */ - proc->pivot = cmd.pivot == CRS_PIVOT; + proc.pivot = cmd.pivot == CRS_PIVOT; input = casereader_create_filter_weight (proc_open (ds), dataset_dict (ds), NULL, NULL); @@ -346,18 +310,18 @@ internal_cmd_crosstabs (struct lexer *lexer, struct dataset *ds, } /* Initialize hash tables. */ - for (pt = &proc->pivots[0]; pt < &proc->pivots[proc->n_pivots]; pt++) + for (pt = &proc.pivots[0]; pt < &proc.pivots[proc.n_pivots]; pt++) hmap_init (&pt->data); /* Tabulate. */ for (; (c = casereader_read (group)) != NULL; case_unref (c)) - for (pt = &proc->pivots[0]; pt < &proc->pivots[proc->n_pivots]; pt++) + for (pt = &proc.pivots[0]; pt < &proc.pivots[proc.n_pivots]; pt++) { double weight = dict_get_case_weight (dataset_dict (ds), c, - &proc->bad_warn); - if (should_tabulate_case (pt, c, proc->exclude)) + &proc.bad_warn); + if (should_tabulate_case (pt, c, proc.exclude)) { - if (proc->mode == GENERAL) + if (proc.mode == GENERAL) tabulate_general_case (pt, c, weight); else tabulate_integer_case (pt, c, weight); @@ -368,12 +332,29 @@ internal_cmd_crosstabs (struct lexer *lexer, struct dataset *ds, casereader_destroy (group); /* Output. */ - postcalc (proc); + postcalc (&proc); } ok = casegrouper_destroy (grouper); ok = proc_commit (ds) && ok; - return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; + result = ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; + +exit: + free (proc.variables); + for (pt = &proc.pivots[0]; pt < &proc.pivots[proc.n_pivots]; pt++) + { + free (pt->vars); + free (pt->const_vars); + /* We must not call value_destroy on const_values because + it is a wild pointer; it never pointed to anything owned + by the pivot_table. + + The rest of the data was allocated and destroyed at a + lower level already. */ + } + free (proc.pivots); + + return result; } /* Parses the TABLES subcommand. */ @@ -654,9 +635,7 @@ tabulate_general_case (struct pivot_table *pt, const struct ccase *c, for (j = 0; j < pt->n_vars; j++) { const struct variable *var = pt->vars[j]; - int width = var_get_width (var); - value_init (&te->values[j], width); - value_copy (&te->values[j], case_data (c, var), width); + value_clone (&te->values[j], case_data (c, var), var_get_width (var)); } hmap_insert (&pt->data, &te->node, hash); } @@ -1141,42 +1120,46 @@ create_crosstab_table (struct crosstabs_proc *proc, struct pivot_table *pt) struct tab_table *table; struct string title; + struct pivot_table x; + int i; - table = tab_create (pt->n_consts + 1 + pt->n_cols + 1, - (pt->n_entries / pt->n_cols) * 3 / 2 * proc->n_cells + 10); - tab_headers (table, pt->n_consts + 1, 0, 2, 0); + make_pivot_table_subset (pt, 0, 0, &x); + + table = tab_create (x.n_consts + 1 + x.n_cols + 1, + (x.n_entries / x.n_cols) * 3 / 2 * proc->n_cells + 10); + tab_headers (table, x.n_consts + 1, 0, 2, 0); /* First header line. */ - tab_joint_text (table, pt->n_consts + 1, 0, - (pt->n_consts + 1) + (pt->n_cols - 1), 0, - TAB_CENTER | TAT_TITLE, var_get_name (pt->vars[COL_VAR])); + tab_joint_text (table, x.n_consts + 1, 0, + (x.n_consts + 1) + (x.n_cols - 1), 0, + TAB_CENTER | TAT_TITLE, var_get_name (x.vars[COL_VAR])); - tab_hline (table, TAL_1, pt->n_consts + 1, - pt->n_consts + 2 + pt->n_cols - 2, 1); + tab_hline (table, TAL_1, x.n_consts + 1, + x.n_consts + 2 + x.n_cols - 2, 1); /* Second header line. */ - for (i = 2; i < pt->n_consts + 2; i++) - tab_joint_text (table, pt->n_consts + 2 - i - 1, 0, - pt->n_consts + 2 - i - 1, 1, - TAB_RIGHT | TAT_TITLE, var_to_string (pt->vars[i])); - tab_text (table, pt->n_consts + 2 - 2, 1, TAB_RIGHT | TAT_TITLE, - var_get_name (pt->vars[ROW_VAR])); - for (i = 0; i < pt->n_cols; i++) - table_value_missing (proc, table, pt->n_consts + 2 + i - 1, 1, TAB_RIGHT, - &pt->cols[i], pt->vars[COL_VAR]); - tab_text (table, pt->n_consts + 2 + pt->n_cols - 1, 1, TAB_CENTER, _("Total")); - - tab_hline (table, TAL_1, 0, pt->n_consts + 2 + pt->n_cols - 1, 2); - tab_vline (table, TAL_1, pt->n_consts + 2 + pt->n_cols - 1, 0, 1); + for (i = 2; i < x.n_consts + 2; i++) + tab_joint_text (table, x.n_consts + 2 - i - 1, 0, + x.n_consts + 2 - i - 1, 1, + TAB_RIGHT | TAT_TITLE, var_to_string (x.vars[i])); + tab_text (table, x.n_consts + 2 - 2, 1, TAB_RIGHT | TAT_TITLE, + var_get_name (x.vars[ROW_VAR])); + for (i = 0; i < x.n_cols; i++) + table_value_missing (proc, table, x.n_consts + 2 + i - 1, 1, TAB_RIGHT, + &x.cols[i], x.vars[COL_VAR]); + tab_text (table, x.n_consts + 2 + x.n_cols - 1, 1, TAB_CENTER, _("Total")); + + tab_hline (table, TAL_1, 0, x.n_consts + 2 + x.n_cols - 1, 2); + tab_vline (table, TAL_1, x.n_consts + 2 + x.n_cols - 1, 0, 1); /* Title. */ ds_init_empty (&title); - for (i = 0; i < pt->n_consts + 2; i++) + for (i = 0; i < x.n_consts + 2; i++) { if (i) ds_put_cstr (&title, " * "); - ds_put_cstr (&title, var_get_name (pt->vars[i])); + ds_put_cstr (&title, var_get_name (x.vars[i])); } for (i = 0; i < pt->n_consts; i++) { @@ -1189,7 +1172,8 @@ create_crosstab_table (struct crosstabs_proc *proc, struct pivot_table *pt) /* Insert the formatted value of the variable, then trim leading spaces in what was just inserted. */ ofs = ds_length (&title); - s = data_out (&pt->const_values[i], dict_get_encoding (proc->dict), var_get_print_format (var)); + s = data_out (&pt->const_values[i], var_get_encoding (var), + var_get_print_format (var)); ds_put_cstr (&title, s); free (s); ds_remove (&title, ofs, ss_cspan (ds_substr (&title, ofs, SIZE_MAX), @@ -1230,11 +1214,11 @@ create_chisq_table (struct pivot_table *pt) tab_text (chisq, 1, 0, TAB_RIGHT | TAT_TITLE, _("Value")); tab_text (chisq, 2, 0, TAB_RIGHT | TAT_TITLE, _("df")); tab_text (chisq, 3, 0, TAB_RIGHT | TAT_TITLE, - _("Asymp. Sig. (2-sided)")); + _("Asymp. Sig. (2-tailed)")); tab_text (chisq, 4, 0, TAB_RIGHT | TAT_TITLE, - _("Exact Sig. (2-sided)")); + _("Exact Sig. (2-tailed)")); tab_text (chisq, 5, 0, TAB_RIGHT | TAT_TITLE, - _("Exact Sig. (1-sided)")); + _("Exact Sig. (1-tailed)")); tab_offset (chisq, 0, 1); return chisq; @@ -1491,10 +1475,10 @@ static void display_dimensions (struct crosstabs_proc *proc, struct pivot_table *pt, struct tab_table *table, int first_difference) { - tab_hline (table, TAL_1, pt->n_vars - first_difference - 1, tab_nc (table) - 1, 0); + tab_hline (table, TAL_1, pt->n_consts + pt->n_vars - first_difference - 1, tab_nc (table) - 1, 0); for (; first_difference >= 2; first_difference--) - table_value_missing (proc, table, pt->n_vars - first_difference - 1, 0, + table_value_missing (proc, table, pt->n_consts + pt->n_vars - first_difference - 1, 0, TAB_RIGHT, &pt->entries[0]->values[first_difference], pt->vars[first_difference]); } @@ -1524,6 +1508,8 @@ format_cell_entry (struct tab_table *table, int c, int r, double value, tab_text_format (table, c, r, TAB_RIGHT, "%s%s", s + strspn (s, " "), suffixes); + + free (s); } /* Displays the crosstabulation table. */ @@ -1536,15 +1522,16 @@ display_crosstabulation (struct crosstabs_proc *proc, struct pivot_table *pt, double *mp; for (r = 0; r < pt->n_rows; r++) - table_value_missing (proc, table, pt->n_vars - 2, r * proc->n_cells, - TAB_RIGHT, &pt->rows[r], pt->vars[ROW_VAR]); + table_value_missing (proc, table, pt->n_consts + pt->n_vars - 2, + r * proc->n_cells, TAB_RIGHT, &pt->rows[r], + pt->vars[ROW_VAR]); tab_text (table, pt->n_vars - 2, pt->n_rows * proc->n_cells, TAB_LEFT, _("Total")); /* Put in the actual cells. */ mp = pt->mat; - tab_offset (table, pt->n_vars - 1, -1); + tab_offset (table, pt->n_consts + pt->n_vars - 1, -1); for (r = 0; r < pt->n_rows; r++) { if (proc->n_cells > 1)