X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fcrosstabs.q;h=be096bc4056d0c155242b53e1c153494dd4786fb;hb=d6259145c57dbef83bbe9fc0d90d35ed14a95a96;hp=f75e249e8fdd3bba0363a9a26240aedd30ad16e3;hpb=608b1765241e7c6f9bd5e86a8f81cf15edeb413b;p=pspp-builds.git diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q index f75e249e..be096bc4 100644 --- a/src/language/stats/crosstabs.q +++ b/src/language/stats/crosstabs.q @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -198,6 +198,8 @@ struct crosstabs_proc /* STATISTICS. */ unsigned int statistics; /* Bit k is 1 if statistic k is requested. */ + + bool descending; /* True if descending sort order is requested. */ }; static bool should_tabulate_case (const struct pivot_table *, @@ -229,6 +231,7 @@ cmd_crosstabs (struct lexer *lexer, struct dataset *ds) proc.n_variables = 0; proc.pivots = NULL; proc.n_pivots = 0; + proc.descending = false; proc.weight_format = wv ? *var_get_print_format (wv) : F_8_0; if (!parse_crosstabs (lexer, ds, &cmd, &proc)) @@ -239,6 +242,9 @@ cmd_crosstabs (struct lexer *lexer, struct dataset *ds) proc.mode = proc.n_variables ? INTEGER : GENERAL; + + proc.descending = cmd.val == CRS_DVALUE; + /* CELLS. */ if (!cmd.sbc_cells) proc.cells = 1u << CRS_CL_COUNT; @@ -406,7 +412,7 @@ crs_custom_tables (struct lexer *lexer, struct dataset *ds, { if (n_by < 2) { - lex_error (lexer, _("expecting BY")); + lex_force_match (lexer, T_BY); goto done; } else @@ -482,12 +488,8 @@ crs_custom_variables (struct lexer *lexer, struct dataset *ds, | PV_NO_DUPLICATE | PV_NO_SCRATCH))) return 0; - if (lex_token (lexer) != '(') - { - lex_error (lexer, "expecting `('"); + if (!lex_force_match (lexer, '(')) goto lossage; - } - lex_get (lexer); if (!lex_force_int (lexer)) goto lossage; @@ -507,12 +509,8 @@ crs_custom_variables (struct lexer *lexer, struct dataset *ds, } lex_get (lexer); - if (lex_token (lexer) != ')') - { - lex_error (lexer, "expecting `)'"); - goto lossage; - } - lex_get (lexer); + if (!lex_force_match (lexer, ')')) + goto lossage; for (i = orig_nv; i < proc->n_variables; i++) { @@ -648,8 +646,11 @@ static int compare_table_entry_vars_3way (const struct table_entry *a, int idx0, int idx1); static int compare_table_entry_3way (const void *ap_, const void *bp_, const void *pt_); +static int compare_table_entry_3way_inv (const void *ap_, const void *bp_, + const void *pt_); + static void enum_var_values (const struct pivot_table *, int var_idx, - union value **valuesp, int *n_values); + union value **valuesp, int *n_values, bool descending); static void output_pivot_table (struct crosstabs_proc *, struct pivot_table *); static void make_pivot_table_subset (struct pivot_table *pt, @@ -677,7 +678,8 @@ postcalc (struct crosstabs_proc *proc) hmap_destroy (&pt->data); sort (pt->entries, pt->n_entries, sizeof *pt->entries, - compare_table_entry_3way, pt); + proc->descending ? compare_table_entry_3way_inv : compare_table_entry_3way, + pt); } make_summary_table (proc); @@ -787,6 +789,13 @@ compare_table_entry_3way (const void *ap_, const void *bp_, const void *pt_) return compare_table_entry_var_3way (a, b, pt, COL_VAR); } +/* Inverted version of compare_table_entry_3way */ +static int +compare_table_entry_3way_inv (const void *ap_, const void *bp_, const void *pt_) +{ + return -compare_table_entry_3way (ap_, bp_, pt_); +} + static int find_first_difference (const struct pivot_table *pt, size_t row) { @@ -913,7 +922,7 @@ output_pivot_table (struct crosstabs_proc *proc, struct pivot_table *pt) struct tab_table *direct = NULL; /* Directional measures table. */ size_t row0, row1; - enum_var_values (pt, COL_VAR, &pt->cols, &pt->n_cols); + enum_var_values (pt, COL_VAR, &pt->cols, &pt->n_cols, proc->descending); if (proc->cells) table = create_crosstab_table (proc, pt); @@ -939,7 +948,7 @@ output_pivot_table (struct crosstabs_proc *proc, struct pivot_table *pt) make_pivot_table_subset (pt, row0, row1, &x); /* Find all the row variable values. */ - enum_var_values (&x, ROW_VAR, &x.rows, &x.n_rows); + enum_var_values (&x, ROW_VAR, &x.rows, &x.n_rows, proc->descending); if (size_overflow_p (xtimes (xtimes (x.n_rows, x.n_cols), sizeof (double)))) @@ -1215,10 +1224,10 @@ create_chisq_table (struct pivot_table *pt) tab_text (chisq, 2, 0, TAB_RIGHT | TAT_TITLE, _("df")); tab_text (chisq, 3, 0, TAB_RIGHT | TAT_TITLE, _("Asymp. Sig. (2-tailed)")); - tab_text (chisq, 4, 0, TAB_RIGHT | TAT_TITLE, - _("Exact Sig. (2-tailed)")); - tab_text (chisq, 5, 0, TAB_RIGHT | TAT_TITLE, - _("Exact Sig. (1-tailed)")); + tab_text_format (chisq, 4, 0, TAB_RIGHT | TAT_TITLE, + _("Exact Sig. (%d-tailed)"), 2); + tab_text_format (chisq, 5, 0, TAB_RIGHT | TAT_TITLE, + _("Exact Sig. (%d-tailed)"), 1); tab_offset (chisq, 0, 1); return chisq; @@ -1385,6 +1394,14 @@ compare_value_3way (const void *a_, const void *b_, const void *width_) return value_compare_3way (a, b, *width); } +/* Inverted version of the above */ +static int +compare_value_3way_inv (const void *a_, const void *b_, const void *width_) +{ + return -compare_value_3way (a_, b_, width_); +} + + /* Given an array of ENTRY_CNT table_entry structures starting at ENTRIES, creates a sorted list of the values that the variable with index VAR_IDX takes on. The values are returned as a @@ -1393,7 +1410,7 @@ compare_value_3way (const void *a_, const void *b_, const void *width_) */ static void enum_var_values (const struct pivot_table *pt, int var_idx, - union value **valuesp, int *n_values) + union value **valuesp, int *n_values, bool descending) { const struct variable *var = pt->vars[var_idx]; struct var_range *range = get_var_range (var); @@ -1437,7 +1454,9 @@ enum_var_values (const struct pivot_table *pt, int var_idx, values[i++] = *iter; hmapx_destroy (&set); - sort (values, *n_values, sizeof *values, compare_value_3way, &width); + sort (values, *n_values, sizeof *values, + descending ? compare_value_3way_inv : compare_value_3way, + &width); } }