X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=d6b5a0ca0c119c9764e49377d65a286466f5dcf8;hb=063c177c238c65c15c906507acb1d4199c220ab5;hp=17032c8c8e90db6e77a4038cb00354a040cbb72f;hpb=fb5ee794ece0f21f0b52ee41e66a8b79c159bcf2;p=pspp diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index 17032c8c8e..d6b5a0ca0c 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -173,8 +173,10 @@ struct ctables_domain const struct ctables_cell *example; - double valid; - double missing; + double d_valid; /* Dictionary weight. */ + double d_missing; + double e_valid; /* Effective weight */ + double e_missing; }; enum ctables_summary_variant @@ -230,7 +232,7 @@ struct ctables bool mrsets_count_duplicates; /* MRSETS. */ bool smissing_listwise; /* SMISSING. */ - struct variable *base_weight; /* WEIGHT. */ + struct variable *e_weight; /* WEIGHT. */ int hide_threshold; /* HIDESMALLCOUNTS. */ struct ctables_table **tables; @@ -1686,7 +1688,7 @@ union ctables_summary /* MEAN, SEMEAN, STDDEV, SUM, VARIANCE, *.SUM. */ struct moments1 *moments; - /* MEDIAN, MODE. */ + /* MEDIAN, MODE, PTILE. */ struct { struct casewriter *writer; @@ -1694,7 +1696,7 @@ union ctables_summary double ovalue; }; - /* XXX percentiles, mode, multiple response */ + /* XXX multiple response */ }; static void @@ -1757,6 +1759,7 @@ ctables_summary_init (union ctables_summary *s, case CTSF_MEDIAN: case CTSF_MODE: + case CTSF_PTILE: { struct caseproto *proto = caseproto_create (); proto = caseproto_add_width (proto, 0); @@ -1773,9 +1776,6 @@ ctables_summary_init (union ctables_summary *s, } break; - case CTSF_PTILE: - NOT_REACHED (); - case CTSF_RESPONSES: case CTSF_ROWPCT_RESPONSES: case CTSF_COLPCT_RESPONSES: @@ -1860,12 +1860,10 @@ ctables_summary_uninit (union ctables_summary *s, case CTSF_MEDIAN: case CTSF_MODE: + case CTSF_PTILE: casewriter_destroy (s->writer); break; - case CTSF_PTILE: - NOT_REACHED (); - case CTSF_RESPONSES: case CTSF_ROWPCT_RESPONSES: case CTSF_COLPCT_RESPONSES: @@ -1896,11 +1894,19 @@ static void ctables_summary_add (union ctables_summary *s, const struct ctables_summary_spec *ss, const struct variable *var, const union value *value, - double weight) + double d_weight, double e_weight) { switch (ss->function) { case CTSF_COUNT: + case CSTF_TOTALN: + case CTSF_VALIDN: + if (var_is_value_missing (var, value)) + s->missing += d_weight; + else + s->valid += d_weight; + break; + case CTSF_ECOUNT: case CTSF_ROWPCT_COUNT: case CTSF_COLPCT_COUNT: @@ -1924,14 +1930,12 @@ ctables_summary_add (union ctables_summary *s, case CTSF_LAYERROWPCT_TOTALN: case CTSF_LAYERCOLPCT_TOTALN: case CTSF_MISSING: - case CSTF_TOTALN: case CTSF_ETOTALN: - case CTSF_VALIDN: case CTSF_EVALIDN: if (var_is_value_missing (var, value)) - s->missing += weight; + s->missing += e_weight; else - s->valid += weight; + s->valid += e_weight; break; case CTSF_MAXIMUM: @@ -1960,25 +1964,23 @@ ctables_summary_add (union ctables_summary *s, case CTSF_LAYERROWPCT_SUM: case CTSF_LAYERCOLPCT_SUM: if (!var_is_value_missing (var, value)) - moments1_add (s->moments, value->f, weight); + moments1_add (s->moments, value->f, e_weight); break; case CTSF_MEDIAN: case CTSF_MODE: + case CTSF_PTILE: if (var_is_value_missing (var, value)) { - s->ovalid += weight; + s->ovalid += e_weight; struct ccase *c = case_create (casewriter_get_proto (s->writer)); *case_num_rw_idx (c, 0) = value->f; - *case_num_rw_idx (c, 1) = weight; + *case_num_rw_idx (c, 1) = e_weight; casewriter_write (s->writer, c); } break; - case CTSF_PTILE: - NOT_REACHED (); - case CTSF_RESPONSES: case CTSF_ROWPCT_RESPONSES: case CTSF_COLPCT_RESPONSES: @@ -2005,6 +2007,99 @@ ctables_summary_add (union ctables_summary *s, } } +static enum ctables_domain_type +ctables_function_domain (enum ctables_summary_function function) +{ + switch (function) + { + case CTSF_COUNT: + case CTSF_ECOUNT: + case CTSF_MISSING: + case CSTF_TOTALN: + case CTSF_ETOTALN: + case CTSF_VALIDN: + case CTSF_EVALIDN: + case CTSF_MAXIMUM: + case CTSF_MINIMUM: + case CTSF_RANGE: + case CTSF_MEAN: + case CTSF_SEMEAN: + case CTSF_STDDEV: + case CTSF_SUM: + case CTSF_VARIANCE: + case CTSF_MEDIAN: + case CTSF_PTILE: + case CTSF_MODE: + case CTSF_RESPONSES: + NOT_REACHED (); + + case CTSF_COLPCT_COUNT: + case CTSF_COLPCT_COUNT_RESPONSES: + case CTSF_COLPCT_RESPONSES: + case CTSF_COLPCT_RESPONSES_COUNT: + case CTSF_COLPCT_SUM: + case CTSF_COLPCT_TOTALN: + case CTSF_COLPCT_VALIDN: + return CTDT_COL; + + case CTSF_LAYERCOLPCT_COUNT: + case CTSF_LAYERCOLPCT_COUNT_RESPONSES: + case CTSF_LAYERCOLPCT_RESPONSES: + case CTSF_LAYERCOLPCT_RESPONSES_COUNT: + case CTSF_LAYERCOLPCT_SUM: + case CTSF_LAYERCOLPCT_TOTALN: + case CTSF_LAYERCOLPCT_VALIDN: + return CTDT_LAYERCOL; + + case CTSF_LAYERPCT_COUNT: + case CTSF_LAYERPCT_COUNT_RESPONSES: + case CTSF_LAYERPCT_RESPONSES: + case CTSF_LAYERPCT_RESPONSES_COUNT: + case CTSF_LAYERPCT_SUM: + case CTSF_LAYERPCT_TOTALN: + case CTSF_LAYERPCT_VALIDN: + return CTDT_LAYER; + + case CTSF_LAYERROWPCT_COUNT: + case CTSF_LAYERROWPCT_COUNT_RESPONSES: + case CTSF_LAYERROWPCT_RESPONSES: + case CTSF_LAYERROWPCT_RESPONSES_COUNT: + case CTSF_LAYERROWPCT_SUM: + case CTSF_LAYERROWPCT_TOTALN: + case CTSF_LAYERROWPCT_VALIDN: + return CTDT_LAYERROW; + + case CTSF_ROWPCT_COUNT: + case CTSF_ROWPCT_COUNT_RESPONSES: + case CTSF_ROWPCT_RESPONSES: + case CTSF_ROWPCT_RESPONSES_COUNT: + case CTSF_ROWPCT_SUM: + case CTSF_ROWPCT_TOTALN: + case CTSF_ROWPCT_VALIDN: + return CTDT_ROW; + + case CTSF_SUBTABLEPCT_COUNT: + case CTSF_SUBTABLEPCT_COUNT_RESPONSES: + case CTSF_SUBTABLEPCT_RESPONSES: + case CTSF_SUBTABLEPCT_RESPONSES_COUNT: + case CTSF_SUBTABLEPCT_SUM: + case CTSF_SUBTABLEPCT_TOTALN: + case CTSF_SUBTABLEPCT_VALIDN: + return CTDT_SUBTABLE; + + case CTSF_TABLEPCT_COUNT: + case CTSF_TABLEPCT_COUNT_RESPONSES: + case CTSF_TABLEPCT_RESPONSES: + case CTSF_TABLEPCT_RESPONSES_COUNT: + case CTSF_TABLEPCT_SUM: + case CTSF_TABLEPCT_TOTALN: + case CTSF_TABLEPCT_VALIDN: + return CTDT_TABLE; + } + + NOT_REACHED (); +} + static double ctables_summary_value (const struct ctables_cell *cell, union ctables_summary *s, @@ -2016,26 +2111,19 @@ ctables_summary_value (const struct ctables_cell *cell, case CTSF_ECOUNT: return s->valid; - case CTSF_SUBTABLEPCT_COUNT: - return cell->domains[CTDT_SUBTABLE]->valid ? s->valid / cell->domains[CTDT_SUBTABLE]->valid * 100 : SYSMIS; - case CTSF_ROWPCT_COUNT: - return cell->domains[CTDT_ROW]->valid ? s->valid / cell->domains[CTDT_ROW]->valid * 100 : SYSMIS; - case CTSF_COLPCT_COUNT: - return cell->domains[CTDT_COL]->valid ? s->valid / cell->domains[CTDT_COL]->valid * 100 : SYSMIS; - case CTSF_TABLEPCT_COUNT: - return cell->domains[CTDT_TABLE]->valid ? s->valid / cell->domains[CTDT_TABLE]->valid * 100 : SYSMIS; - + case CTSF_SUBTABLEPCT_COUNT: case CTSF_LAYERPCT_COUNT: - return cell->domains[CTDT_LAYER]->valid ? s->valid / cell->domains[CTDT_LAYER]->valid * 100 : SYSMIS; - case CTSF_LAYERROWPCT_COUNT: - return cell->domains[CTDT_LAYERROW]->valid ? s->valid / cell->domains[CTDT_LAYERROW]->valid * 100 : SYSMIS; - case CTSF_LAYERCOLPCT_COUNT: - return cell->domains[CTDT_LAYERCOL]->valid ? s->valid / cell->domains[CTDT_LAYERCOL]->valid * 100 : SYSMIS; + { + enum ctables_domain_type d = ctables_function_domain (ss->function); + return (cell->domains[d]->e_valid + ? s->valid / cell->domains[d]->e_valid * 100 + : SYSMIS); + } case CTSF_ROWPCT_VALIDN: case CTSF_COLPCT_VALIDN: @@ -2118,16 +2206,18 @@ ctables_summary_value (const struct ctables_cell *cell, NOT_REACHED (); case CTSF_MEDIAN: + case CTSF_PTILE: if (s->writer) { struct casereader *reader = casewriter_make_reader (s->writer); s->writer = NULL; - struct percentile *median = percentile_create (0.5, s->ovalid); - struct order_stats *os = &median->parent; + struct percentile *ptile = percentile_create ( + ss->function == CTSF_PTILE ? ss->percentile : 0.5, s->ovalid); + struct order_stats *os = &ptile->parent; order_stats_accumulate_idx (&os, 1, reader, 1, 0); - s->ovalue = percentile_calculate (median, PC_HAVERAGE); - statistic_destroy (&median->parent.parent); + s->ovalue = percentile_calculate (ptile, PC_HAVERAGE); + statistic_destroy (&ptile->parent.parent); } return s->ovalue; @@ -2145,9 +2235,6 @@ ctables_summary_value (const struct ctables_cell *cell, } return s->ovalue; - case CTSF_PTILE: - NOT_REACHED (); - case CTSF_RESPONSES: case CTSF_ROWPCT_RESPONSES: case CTSF_COLPCT_RESPONSES: @@ -2480,7 +2567,7 @@ static void ctables_cell_add__ (struct ctables_table *t, const struct ccase *c, size_t ix[PIVOT_N_AXES], const struct ctables_category *cats[PIVOT_N_AXES][10], - double weight) + double d_weight, double e_weight) { struct ctables_cell *cell = ctables_cell_insert__ (t, c, ix, cats); const struct ctables_nest *ss = &t->stacks[t->summary_axis].nests[ix[t->summary_axis]]; @@ -2488,17 +2575,22 @@ ctables_cell_add__ (struct ctables_table *t, const struct ccase *c, const struct ctables_summary_spec_set *specs = &ss->specs[cell->sv]; for (size_t i = 0; i < specs->n; i++) ctables_summary_add (&cell->summaries[i], &specs->specs[i], specs->var, - case_data (c, specs->var), weight); + case_data (c, specs->var), d_weight, e_weight); if (cell->contributes_to_domains) - for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++) - cell->domains[dt]->valid += weight; + { + for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++) + { + cell->domains[dt]->d_valid += d_weight; + cell->domains[dt]->e_valid += e_weight; + } + } } static void recurse_totals (struct ctables_table *t, const struct ccase *c, size_t ix[PIVOT_N_AXES], const struct ctables_category *cats[PIVOT_N_AXES][10], - double weight, + double d_weight, double e_weight, enum pivot_axis_type start_axis, size_t start_nest) { for (enum pivot_axis_type a = start_axis; a < PIVOT_N_AXES; a++) @@ -2517,8 +2609,8 @@ recurse_totals (struct ctables_table *t, const struct ccase *c, { const struct ctables_category *save = cats[a][i]; cats[a][i] = total; - ctables_cell_add__ (t, c, ix, cats, weight); - recurse_totals (t, c, ix, cats, weight, a, i + 1); + ctables_cell_add__ (t, c, ix, cats, d_weight, e_weight); + recurse_totals (t, c, ix, cats, d_weight, e_weight, a, i + 1); cats[a][i] = save; } } @@ -2530,7 +2622,7 @@ static void recurse_subtotals (struct ctables_table *t, const struct ccase *c, size_t ix[PIVOT_N_AXES], const struct ctables_category *cats[PIVOT_N_AXES][10], - double weight, + double d_weight, double e_weight, enum pivot_axis_type start_axis, size_t start_nest) { for (enum pivot_axis_type a = start_axis; a < PIVOT_N_AXES; a++) @@ -2545,8 +2637,8 @@ recurse_subtotals (struct ctables_table *t, const struct ccase *c, if (save->subtotal) { cats[a][i] = save->subtotal; - ctables_cell_add__ (t, c, ix, cats, weight); - recurse_subtotals (t, c, ix, cats, weight, a, i + 1); + ctables_cell_add__ (t, c, ix, cats, d_weight, e_weight); + recurse_subtotals (t, c, ix, cats, d_weight, e_weight, a, i + 1); cats[a][i] = save; } } @@ -2557,15 +2649,9 @@ recurse_subtotals (struct ctables_table *t, const struct ccase *c, static void ctables_cell_insert (struct ctables_table *t, const struct ccase *c, - size_t ir, size_t ic, size_t il, - double weight) + size_t ix[PIVOT_N_AXES], + double d_weight, double e_weight) { - size_t ix[PIVOT_N_AXES] = { - [PIVOT_AXIS_ROW] = ir, - [PIVOT_AXIS_COLUMN] = ic, - [PIVOT_AXIS_LAYER] = il, - }; - const struct ctables_category *cats[PIVOT_N_AXES][10]; for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++) { @@ -2588,10 +2674,10 @@ ctables_cell_insert (struct ctables_table *t, } } - ctables_cell_add__ (t, c, ix, cats, weight); + ctables_cell_add__ (t, c, ix, cats, d_weight, e_weight); - recurse_totals (t, c, ix, cats, weight, 0, 0); - recurse_subtotals (t, c, ix, cats, weight, 0, 0); + recurse_totals (t, c, ix, cats, d_weight, e_weight, 0, 0); + recurse_subtotals (t, c, ix, cats, d_weight, e_weight, 0, 0); } struct merge_item @@ -2832,6 +2918,8 @@ ctables_table_output (struct ctables *ct, struct ctables_table *t) struct pivot_category *parent = k ? groups[k - 1] : d[a]->root; if (level->type == CTL_SUMMARY) { + assert (k == n_levels - 1); + const struct ctables_summary_spec_set *specs = &t->summary_specs; for (size_t m = 0; m < specs->n; m++) { @@ -3227,17 +3315,18 @@ ctables_sort_clabels_values (struct ctables_table *t) static bool ctables_execute (struct dataset *ds, struct ctables *ct) { - struct casereader *input = casereader_create_filter_weight (proc_open (ds), - dataset_dict (ds), - NULL, NULL); + struct casereader *input = proc_open (ds); bool warn_on_invalid = true; - double total_weight = 0; for (struct ccase *c = casereader_read (input); c; case_unref (c), c = casereader_read (input)) { - double weight = dict_get_case_weight (dataset_dict (ds), c, - &warn_on_invalid); - total_weight += weight; + double d_weight = dict_get_case_weight (dataset_dict (ds), c, + &warn_on_invalid); + double e_weight = (ct->e_weight + ? var_force_valid_weight (ct->e_weight, + case_num (c, ct->e_weight), + &warn_on_invalid) + : d_weight); for (size_t i = 0; i < ct->n_tables; i++) { @@ -3246,7 +3335,15 @@ ctables_execute (struct dataset *ds, struct ctables *ct) for (size_t ir = 0; ir < t->stacks[PIVOT_AXIS_ROW].n; ir++) for (size_t ic = 0; ic < t->stacks[PIVOT_AXIS_COLUMN].n; ic++) for (size_t il = 0; il < t->stacks[PIVOT_AXIS_LAYER].n; il++) - ctables_cell_insert (t, c, ir, ic, il, weight); + { + size_t ix[PIVOT_N_AXES] = { + [PIVOT_AXIS_ROW] = ir, + [PIVOT_AXIS_COLUMN] = ic, + [PIVOT_AXIS_LAYER] = il, + }; + + ctables_cell_insert (t, c, ix, d_weight, e_weight); + } for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++) if (t->label_axis[a] != a) @@ -3446,8 +3543,8 @@ cmd_ctables (struct lexer *lexer, struct dataset *ds) if (!lex_force_match_id (lexer, "VARIABLE")) goto error; lex_match (lexer, T_EQUALS); - ct->base_weight = parse_variable (lexer, dataset_dict (ds)); - if (!ct->base_weight) + ct->e_weight = parse_variable (lexer, dataset_dict (ds)); + if (!ct->e_weight) goto error; } else if (lex_match_id (lexer, "HIDESMALLCOUNTS"))