axes (except the scalar variable, if any). */
struct hmap_node node;
- /* The domains that contains this cell. */
+ /* The domains that contain this cell. */
struct ctables_domain *domains[N_CTDTS];
+ bool hide;
+
struct
{
size_t vaa_idx;
}
type;
+ struct ctables_category *subtotal;
+
union
{
double number; /* CCT_NUMBER. */
};
};
-static const struct ctables_category *ctables_categories_match (
- const struct ctables_categories *, const union value *,
- const struct variable *);
-
static void
ctables_category_uninit (struct ctables_category *cat)
{
return false;
}
- if ((cat->type == CCT_SUBTOTAL || cat->type == CCT_HSUBTOTAL)
- && lex_match (lexer, T_EQUALS))
+ if (cat->type == CCT_SUBTOTAL || cat->type == CCT_HSUBTOTAL)
{
- if (!lex_force_string (lexer))
- return false;
+ if (lex_match (lexer, T_EQUALS))
+ {
+ if (!lex_force_string (lexer))
+ return false;
- cat->total_label = ss_xstrdup (lex_tokss (lexer));
- lex_get (lexer);
+ cat->total_label = ss_xstrdup (lex_tokss (lexer));
+ lex_get (lexer);
+ }
+ else
+ cat->total_label = xstrdup (_("Subtotal"));
}
c->n_cats++;
};
}
+ struct ctables_category *subtotal = NULL;
+ for (size_t i = totals_before ? 0 : c->n_cats;
+ totals_before ? i < c->n_cats : i-- > 0;
+ totals_before ? i++ : 0)
+ {
+ struct ctables_category *cat = &c->cats[i];
+ switch (cat->type)
+ {
+ case CCT_NUMBER:
+ case CCT_STRING:
+ case CCT_RANGE:
+ case CCT_MISSING:
+ case CCT_OTHERNM:
+ cat->subtotal = subtotal;
+ break;
+
+ case CCT_SUBTOTAL:
+ case CCT_HSUBTOTAL:
+ subtotal = cat;
+ break;
+
+ case CCT_TOTAL:
+ case CCT_VALUE:
+ case CCT_LABEL:
+ case CCT_FUNCTION:
+ break;
+ }
+ }
+
return true;
}
}
static double
-ctables_summary_value (const struct ctables_cell *f,
+ctables_summary_value (const struct ctables_cell *cell,
union ctables_summary *s,
const struct ctables_summary_spec *ss)
{
return s->valid;
case CTSF_SUBTABLEPCT_COUNT:
- return f->domains[CTDT_SUBTABLE]->valid ? s->valid / f->domains[CTDT_SUBTABLE]->valid * 100 : SYSMIS;
+ return cell->domains[CTDT_SUBTABLE]->valid ? s->valid / cell->domains[CTDT_SUBTABLE]->valid * 100 : SYSMIS;
case CTSF_ROWPCT_COUNT:
- return f->domains[CTDT_ROW]->valid ? s->valid / f->domains[CTDT_ROW]->valid * 100 : SYSMIS;
+ return cell->domains[CTDT_ROW]->valid ? s->valid / cell->domains[CTDT_ROW]->valid * 100 : SYSMIS;
case CTSF_COLPCT_COUNT:
- return f->domains[CTDT_COL]->valid ? s->valid / f->domains[CTDT_COL]->valid * 100 : SYSMIS;
+ return cell->domains[CTDT_COL]->valid ? s->valid / cell->domains[CTDT_COL]->valid * 100 : SYSMIS;
case CTSF_TABLEPCT_COUNT:
- return f->domains[CTDT_TABLE]->valid ? s->valid / f->domains[CTDT_TABLE]->valid * 100 : SYSMIS;
+ return cell->domains[CTDT_TABLE]->valid ? s->valid / cell->domains[CTDT_TABLE]->valid * 100 : SYSMIS;
case CTSF_LAYERPCT_COUNT:
- return f->domains[CTDT_LAYER]->valid ? s->valid / f->domains[CTDT_LAYER]->valid * 100 : SYSMIS;
+ return cell->domains[CTDT_LAYER]->valid ? s->valid / cell->domains[CTDT_LAYER]->valid * 100 : SYSMIS;
case CTSF_LAYERROWPCT_COUNT:
- return f->domains[CTDT_LAYERROW]->valid ? s->valid / f->domains[CTDT_LAYERROW]->valid * 100 : SYSMIS;
+ return cell->domains[CTDT_LAYERROW]->valid ? s->valid / cell->domains[CTDT_LAYERROW]->valid * 100 : SYSMIS;
case CTSF_LAYERCOLPCT_COUNT:
- return f->domains[CTDT_LAYERCOL]->valid ? s->valid / f->domains[CTDT_LAYERCOL]->valid * 100 : SYSMIS;
+ return cell->domains[CTDT_LAYERCOL]->valid ? s->valid / cell->domains[CTDT_LAYERCOL]->valid * 100 : SYSMIS;
case CTSF_ROWPCT_VALIDN:
case CTSF_COLPCT_VALIDN:
*/
static struct ctables_domain *
-ctables_domain_insert (struct ctables_table *t, struct ctables_cell *f,
+ctables_domain_insert (struct ctables_table *t, struct ctables_cell *cell,
enum ctables_domain_type domain)
{
size_t hash = 0;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
- size_t idx = f->axes[a].vaa_idx;
+ size_t idx = cell->axes[a].vaa_idx;
const struct var_array *va = &t->vaas[a].vas[idx];
hash = hash_int (idx, hash);
for (size_t i = 0; i < va->n_domains[domain]; i++)
{
size_t v_idx = va->domains[domain][i];
- hash = value_hash (&f->axes[a].cvs[v_idx].value,
+ hash = value_hash (&cell->axes[a].cvs[v_idx].value,
var_get_width (va->vars[v_idx]), hash);
}
}
const struct ctables_cell *df = d->example;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
- size_t idx = f->axes[a].vaa_idx;
+ size_t idx = cell->axes[a].vaa_idx;
if (idx != df->axes[a].vaa_idx)
goto not_equal;
{
size_t v_idx = va->domains[domain][i];
if (!value_equal (&df->axes[a].cvs[v_idx].value,
- &f->axes[a].cvs[v_idx].value,
+ &cell->axes[a].cvs[v_idx].value,
var_get_width (va->vars[v_idx])))
goto not_equal;
}
}
d = xmalloc (sizeof *d);
- *d = (struct ctables_domain) { .example = f };
+ *d = (struct ctables_domain) { .example = cell };
hmap_insert (&t->domains[domain], &d->node, hash);
return d;
}
return var_is_value_missing (var, v) ? NULL : othernm;
}
+static const struct ctables_category *
+ctables_categories_total (const struct ctables_categories *c)
+{
+ const struct ctables_category *first = &c->cats[0];
+ const struct ctables_category *last = &c->cats[c->n_cats - 1];
+ return (first->type == CCT_TOTAL ? first
+ : last->type == CCT_TOTAL ? last
+ : NULL);
+}
+
static void
-ctables_cell_insert (struct ctables_table *t,
- const struct ccase *c,
- size_t ir, size_t ic, size_t il,
- double weight)
+ctables_cell_insert__ (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)
{
- size_t ix[PIVOT_N_AXES] = {
- [PIVOT_AXIS_ROW] = ir,
- [PIVOT_AXIS_COLUMN] = ic,
- [PIVOT_AXIS_LAYER] = il,
- };
const struct var_array *ss = &t->vaas[t->summary_axis].vas[ix[t->summary_axis]];
- const struct ctables_category *cats[PIVOT_N_AXES][10];
- for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
- {
- const struct var_array *va = &t->vaas[a].vas[ix[a]];
- for (size_t i = 0; i < va->n; i++)
- {
- if (i == va->scale_idx)
- continue;
-
- const struct variable *var = va->vars[i];
- const union value *value = case_data (c, var);
-
- if (var_is_numeric (var) && value->f == SYSMIS)
- return;
-
- cats[a][i] = ctables_categories_match (
- t->categories[var_get_dict_index (var)], value, var);
- if (!cats[a][i])
- return;
- }
- }
-
size_t hash = 0;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
hash = hash_int (ix[a], hash);
for (size_t i = 0; i < va->n; i++)
if (i != va->scale_idx)
- hash = value_hash (case_data (c, va->vars[i]),
- var_get_width (va->vars[i]), hash);
+ {
+ hash = hash_pointer (cats[a][i], hash);
+ if (cats[a][i]->type != CCT_TOTAL
+ && cats[a][i]->type != CCT_SUBTOTAL
+ && cats[a][i]->type != CCT_HSUBTOTAL)
+ hash = value_hash (case_data (c, va->vars[i]),
+ var_get_width (va->vars[i]), hash);
+ }
}
- struct ctables_cell *f;
- HMAP_FOR_EACH_WITH_HASH (f, struct ctables_cell, node, hash, &t->cells)
+ struct ctables_cell *cell;
+ HMAP_FOR_EACH_WITH_HASH (cell, struct ctables_cell, node, hash, &t->cells)
{
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
const struct var_array *va = &t->vaas[a].vas[ix[a]];
- if (f->axes[a].vaa_idx != ix[a])
+ if (cell->axes[a].vaa_idx != ix[a])
goto not_equal;
for (size_t i = 0; i < va->n; i++)
if (i != va->scale_idx
- && !value_equal (case_data (c, va->vars[i]),
- &f->axes[a].cvs[i].value,
- var_get_width (va->vars[i])))
+ && (cats[a][i] != cell->axes[a].cvs[i].category
+ || (cats[a][i]->type != CCT_TOTAL
+ && cats[a][i]->type != CCT_SUBTOTAL
+ && cats[a][i]->type != CCT_HSUBTOTAL
+ && !value_equal (case_data (c, va->vars[i]),
+ &cell->axes[a].cvs[i].value,
+ var_get_width (va->vars[i])))))
goto not_equal;
}
not_equal: ;
}
- f = xmalloc (sizeof *f);
+ cell = xmalloc (sizeof *cell);
+ cell->hide = false;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
const struct var_array *va = &t->vaas[a].vas[ix[a]];
- f->axes[a].vaa_idx = ix[a];
- f->axes[a].cvs = (va->n
- ? xnmalloc (va->n, sizeof *f->axes[a].cvs)
+ cell->axes[a].vaa_idx = ix[a];
+ cell->axes[a].cvs = (va->n
+ ? xnmalloc (va->n, sizeof *cell->axes[a].cvs)
: NULL);
for (size_t i = 0; i < va->n; i++)
{
- f->axes[a].cvs[i].category = cats[a][i];
- value_clone (&f->axes[a].cvs[i].value, case_data (c, va->vars[i]),
+ if (i != va->scale_idx)
+ {
+ const struct ctables_category *subtotal = cats[a][i]->subtotal;
+ if (subtotal && subtotal->type == CCT_HSUBTOTAL)
+ cell->hide = true;
+ }
+
+ cell->axes[a].cvs[i].category = cats[a][i];
+ value_clone (&cell->axes[a].cvs[i].value, case_data (c, va->vars[i]),
var_get_width (va->vars[i]));
}
}
- f->summaries = xmalloc (ss->n_summaries * sizeof *f->summaries);
+ cell->summaries = xmalloc (ss->n_summaries * sizeof *cell->summaries);
for (size_t i = 0; i < ss->n_summaries; i++)
- ctables_summary_init (&f->summaries[i], &ss->summaries[i]);
+ ctables_summary_init (&cell->summaries[i], &ss->summaries[i]);
for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
- f->domains[dt] = ctables_domain_insert (t, f, dt);
- hmap_insert (&t->cells, &f->node, hash);
+ cell->domains[dt] = ctables_domain_insert (t, cell, dt);
+ hmap_insert (&t->cells, &cell->node, hash);
summarize:
for (size_t i = 0; i < ss->n_summaries; i++)
- ctables_summary_add (&f->summaries[i], &ss->summaries[i], ss->summary_var,
+ ctables_summary_add (&cell->summaries[i], &ss->summaries[i], ss->summary_var,
case_data (c, ss->summary_var), weight);
for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
- f->domains[dt]->valid += weight;
+ cell->domains[dt]->valid += 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,
+ enum pivot_axis_type start_a, size_t start_va)
+{
+ for (enum pivot_axis_type a = start_a; a < PIVOT_N_AXES; a++)
+ {
+ const struct var_array *va = &t->vaas[a].vas[ix[a]];
+ for (size_t i = start_va; i < va->n; i++)
+ {
+ if (i == va->scale_idx)
+ continue;
+
+ const struct variable *var = va->vars[i];
+
+ const struct ctables_category *total = ctables_categories_total (
+ t->categories[var_get_dict_index (var)]);
+ if (total)
+ {
+ const struct ctables_category *save = cats[a][i];
+ cats[a][i] = total;
+ ctables_cell_insert__ (t, c, ix, cats, weight);
+ recurse_totals (t, c, ix, cats, weight, a, i + 1);
+ cats[a][i] = save;
+ }
+ }
+ start_va = 0;
+ }
+}
+
+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] = {
+ [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++)
+ {
+ const struct var_array *va = &t->vaas[a].vas[ix[a]];
+ for (size_t i = 0; i < va->n; i++)
+ {
+ if (i == va->scale_idx)
+ continue;
+
+ const struct variable *var = va->vars[i];
+ const union value *value = case_data (c, var);
+
+ if (var_is_numeric (var) && value->f == SYSMIS)
+ return;
+
+ cats[a][i] = ctables_categories_match (
+ t->categories[var_get_dict_index (var)], value, var);
+ if (!cats[a][i])
+ return;
+ }
+ }
+
+ ctables_cell_insert__ (t, c, ix, cats, weight);
+
+ recurse_totals (t, c, ix, cats, weight, 0, 0);
+
+ for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
+ {
+ const struct var_array *va = &t->vaas[a].vas[ix[a]];
+ for (size_t i = 0; i < va->n; i++)
+ {
+ if (i == va->scale_idx)
+ continue;
+
+ const struct ctables_category *save = cats[a][i];
+ if (save->subtotal)
+ {
+ cats[a][i] = save->subtotal;
+ ctables_cell_insert__ (t, c, ix, cats, weight);
+ cats[a][i] = save;
+ }
+ }
+ }
}
static bool
(t->title
? pivot_value_new_user_text (t->title, SIZE_MAX)
: pivot_value_new_text (N_("Custom Tables"))),
- NULL);
+ "Custom Tables");
if (t->caption)
pivot_table_set_caption (
pt, pivot_value_new_user_text (t->caption, SIZE_MAX));
struct ctables_cell **sorted = xnmalloc (t->cells.count, sizeof *sorted);
- struct ctables_cell *f;
+ struct ctables_cell *cell;
size_t n = 0;
- HMAP_FOR_EACH (f, struct ctables_cell, node, &t->cells)
- sorted[n++] = f;
- assert (n == t->cells.count);
+ HMAP_FOR_EACH (cell, struct ctables_cell, node, &t->cells)
+ if (!cell->hide)
+ sorted[n++] = cell;
+ assert (n <= t->cells.count);
struct ctables_cell_sort_aux aux = { .t = t, .a = a };
sort (sorted, n, sizeof *sorted, ctables_cell_compare_3way, &aux);
int prev_leaf = 0;
for (size_t j = 0; j < n; j++)
{
- struct ctables_cell *f = sorted[j];
- const struct var_array *va = &t->vaas[a].vas[f->axes[a].vaa_idx];
+ struct ctables_cell *cell = sorted[j];
+ const struct var_array *va = &t->vaas[a].vas[cell->axes[a].vaa_idx];
size_t n_common = 0;
bool new_subtable = false;
if (j > 0)
{
struct ctables_cell *prev = sorted[j - 1];
- if (prev->axes[a].vaa_idx == f->axes[a].vaa_idx)
+ if (prev->axes[a].vaa_idx == cell->axes[a].vaa_idx)
{
for (; n_common < va->n; n_common++)
if (n_common != va->scale_idx
- && !value_equal (&prev->axes[a].cvs[n_common].value,
- &f->axes[a].cvs[n_common].value,
- var_get_type (va->vars[n_common])))
+ && (prev->axes[a].cvs[n_common].category
+ != cell->axes[a].cvs[n_common].category
+ || !value_equal (&prev->axes[a].cvs[n_common].value,
+ &cell->axes[a].cvs[n_common].value,
+ var_get_type (va->vars[n_common]))))
break;
}
else
}
if (n_common == va->n)
{
- f->axes[a].leaf = prev_leaf;
+ cell->axes[a].leaf = prev_leaf;
continue;
}
struct pivot_category *parent = k > 0 ? groups[k - 1] : top;
struct pivot_value *label
- = (k != va->scale_idx
- ? pivot_value_new_var_value (va->vars[k],
- &f->axes[a].cvs[k].value)
- : NULL);
+ = (k == va->scale_idx ? NULL
+ : (cell->axes[a].cvs[k].category->type == CCT_TOTAL
+ || cell->axes[a].cvs[k].category->type == CCT_SUBTOTAL
+ || cell->axes[a].cvs[k].category->type == CCT_HSUBTOTAL)
+ ? pivot_value_new_user_text (cell->axes[a].cvs[k].category->total_label,
+ SIZE_MAX)
+ : pivot_value_new_var_value (va->vars[k],
+ &cell->axes[a].cvs[k].value));
if (k == va->n - 1)
{
if (a == t->summary_axis)
groups[k] = parent;
}
- f->axes[a].leaf = prev_leaf;
+ cell->axes[a].leaf = prev_leaf;
}
free (sorted);
free (groups);
}
- struct ctables_cell *f;
- HMAP_FOR_EACH (f, struct ctables_cell, node, &t->cells)
+ struct ctables_cell *cell;
+ HMAP_FOR_EACH (cell, struct ctables_cell, node, &t->cells)
{
- const struct var_array *ss = &t->vaas[t->summary_axis].vas[f->axes[t->summary_axis].vaa_idx];
+ if (cell->hide)
+ continue;
+
+ const struct var_array *ss = &t->vaas[t->summary_axis].vas[cell->axes[t->summary_axis].vaa_idx];
for (size_t j = 0; j < ss->n_summaries; j++)
{
size_t dindexes[3];
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
if (d[a])
{
- int leaf = f->axes[a].leaf;
+ int leaf = cell->axes[a].leaf;
if (a == t->summary_axis)
leaf += j;
dindexes[n_dindexes++] = leaf;
}
- double d = ctables_summary_value (f, &f->summaries[j], &ss->summaries[j]);
+ double d = ctables_summary_value (cell, &cell->summaries[j], &ss->summaries[j]);
struct pivot_value *value = pivot_value_new_number (d);
value->numeric.format = ss->summaries[j].format;
pivot_table_put (pt, dindexes, n_dindexes, value);
"SIGTEST", "COMPARETEST");
goto error;
}
+
+ if (!lex_match (lexer, T_SLASH))
+ break;
}
if (t->row_labels != CTLP_NORMAL && t->col_labels != CTLP_NORMAL)