double missing;
};
+enum ctables_summary_variant
+ {
+ CSV_CELL,
+ CSV_TOTAL
+#define N_CSVS 2
+ };
+
struct ctables_cell
{
/* In struct ctables's 'cells' hmap. Indexed by all the values in all the
struct ctables_domain *domains[N_CTDTS];
bool hide;
+ enum ctables_summary_variant sv;
struct
{
- size_t vaa_idx;
+ size_t stack_idx;
struct ctables_cell_value
{
const struct ctables_category *category;
CTLP_LAYER,
};
-struct var_array
+struct ctables_summary_spec_set
+ {
+ struct ctables_summary_spec *specs;
+ size_t n;
+ size_t allocated;
+
+ struct variable *var;
+ };
+
+static void ctables_summary_spec_set_clone (struct ctables_summary_spec_set *,
+ const struct ctables_summary_spec_set *);
+static void ctables_summary_spec_set_uninit (struct ctables_summary_spec_set *);
+
+/* A nested sequence of variables, e.g. a > b > c. */
+struct ctables_nest
{
struct variable **vars;
size_t n;
size_t *domains[N_CTDTS];
size_t n_domains[N_CTDTS];
- struct ctables_summary_spec *summaries;
- size_t n_summaries;
- struct variable *summary_var;
+ struct ctables_summary_spec_set specs[N_CSVS];
};
-struct var_array2
+/* A stack of nestings, e.g. nest1 + nest2 + ... + nestN. */
+struct ctables_stack
{
- struct var_array *vas;
+ struct ctables_nest *nests;
size_t n;
};
struct ctables_table
{
struct ctables_axis *axes[PIVOT_N_AXES];
- struct var_array2 vaas[PIVOT_N_AXES];
+ struct ctables_stack stacks[PIVOT_N_AXES];
enum pivot_axis_type summary_axis;
struct hmap cells;
struct hmap domains[N_CTDTS];
{
struct ctables_var var;
bool scale;
- struct ctables_summary_spec *summaries;
- size_t n_summaries;
- size_t allocated_summaries;
+ struct ctables_summary_spec_set specs[N_CSVS];
};
/* Nonterminals. */
double percentile; /* CTSF_PTILE only. */
char *label;
struct fmt_spec format; /* XXX extra CTABLES formats */
+ size_t axis_idx;
};
+static void
+ctables_summary_spec_clone (struct ctables_summary_spec *dst,
+ const struct ctables_summary_spec *src)
+{
+ *dst = *src;
+ dst->label = xstrdup (src->label);
+}
+
static void
ctables_summary_spec_uninit (struct ctables_summary_spec *s)
{
free (s->label);
}
+static void
+ctables_summary_spec_set_clone (struct ctables_summary_spec_set *dst,
+ const struct ctables_summary_spec_set *src)
+{
+ struct ctables_summary_spec *specs = xnmalloc (src->n, sizeof *specs);
+ for (size_t i = 0; i < src->n; i++)
+ ctables_summary_spec_clone (&specs[i], &src->specs[i]);
+
+ *dst = (struct ctables_summary_spec_set) {
+ .specs = specs,
+ .n = src->n,
+ .allocated = src->n,
+ .var = src->var
+ };
+}
+
+static void
+ctables_summary_spec_set_uninit (struct ctables_summary_spec_set *set)
+{
+ for (size_t i = 0; i < set->n; i++)
+ ctables_summary_spec_uninit (&set->specs[i]);
+ free (set->specs);
+}
+
static bool
parse_col_width (struct lexer *lexer, const char *name, double *width)
{
switch (axis->op)
{
case CTAO_VAR:
- for (size_t i = 0; i < axis->n_summaries; i++)
- ctables_summary_spec_uninit (&axis->summaries[i]);
- free (axis->summaries);
+ for (size_t i = 0; i < N_CSVS; i++)
+ ctables_summary_spec_set_uninit (&axis->specs[i]);
break;
case CTAO_STACK:
add_summary_spec (struct ctables_axis *axis,
enum ctables_summary_function function, double percentile,
const char *label, const struct fmt_spec *format,
- const struct msg_location *loc)
+ const struct msg_location *loc, enum ctables_summary_variant sv)
{
if (axis->op == CTAO_VAR)
{
- if (axis->n_summaries >= axis->allocated_summaries)
- axis->summaries = x2nrealloc (axis->summaries,
- &axis->allocated_summaries,
- sizeof *axis->summaries);
-
const char *function_name = ctables_summary_function_name (function);
const char *var_name = ctables_var_name (&axis->var);
switch (ctables_function_availability (function))
break;
}
- struct ctables_summary_spec *dst = &axis->summaries[axis->n_summaries++];
+ struct ctables_summary_spec_set *set = &axis->specs[sv];
+ if (set->n >= set->allocated)
+ set->specs = x2nrealloc (set->specs, &set->allocated,
+ sizeof *set->specs);
+
+ struct ctables_summary_spec *dst = &set->specs[set->n++];
*dst = (struct ctables_summary_spec) {
.function = function,
.percentile = percentile,
{
for (size_t i = 0; i < 2; i++)
if (!add_summary_spec (axis->subs[i], function, percentile, label,
- format, loc))
+ format, loc, sv))
return false;
return true;
}
return axis;
}
+static bool
+has_digit (const char *s)
+{
+ return s[strcspn (s, "0123456789")] != '\0';
+}
+
static struct ctables_axis *
ctables_axis_parse_postfix (struct ctables_axis_parse_ctx *ctx)
{
if (!sub || !lex_match (ctx->lexer, T_LBRACK))
return sub;
- do
+ enum ctables_summary_variant sv = CSV_CELL;
+ for (;;)
{
int start_ofs = lex_ofs (ctx->lexer);
/* Parse format. */
struct fmt_spec format;
const struct fmt_spec *formatp;
- if (lex_token (ctx->lexer) == T_ID)
+ if (lex_token (ctx->lexer) == T_ID
+ && has_digit (lex_tokcstr (ctx->lexer)))
{
if (!parse_format_specifier (ctx->lexer, &format)
|| !fmt_check_output (&format)
struct msg_location *loc = lex_ofs_location (ctx->lexer, start_ofs,
lex_ofs (ctx->lexer) - 1);
- add_summary_spec (sub, function, percentile, label, formatp, loc);
+ printf ("add %s\n", ctables_summary_function_name (function));
+ add_summary_spec (sub, function, percentile, label, formatp, loc, sv);
free (label);
msg_location_destroy (loc);
lex_match (ctx->lexer, T_COMMA);
+ if (sv == CSV_CELL && lex_match_id (ctx->lexer, "TOTALS"))
+ {
+ if (!lex_force_match (ctx->lexer, T_LBRACK))
+ goto error;
+ sv = CSV_TOTAL;
+ }
+ else if (lex_match (ctx->lexer, T_RBRACK))
+ {
+ if (sv == CSV_TOTAL && !lex_force_match (ctx->lexer, T_RBRACK))
+ goto error;
+ return sub;
+ }
}
- while (!lex_match (ctx->lexer, T_RBRACK));
-
- return sub;
error:
ctables_axis_destroy (sub);
if (!axis)
return NULL;
else if (axis->op == CTAO_VAR)
- return !axis->scale && axis->n_summaries ? axis : NULL;
+ return !axis->scale && axis->specs[CSV_CELL].n ? axis : NULL;
else
{
for (size_t i = 0; i < 2; i++)
}
static void
-var_array_uninit (struct var_array *va)
+ctables_nest_uninit (struct ctables_nest *nest)
{
- if (va)
- free (va->vars);
+ if (nest)
+ free (nest->vars);
}
static void
-var_array2_uninit (struct var_array2 *vaa)
+ctables_stack_uninit (struct ctables_stack *stack)
{
- if (vaa)
+ if (stack)
{
- for (size_t i = 0; i < vaa->n; i++)
- var_array_uninit (&vaa->vas[i]);
- free (vaa->vas);
+ for (size_t i = 0; i < stack->n; i++)
+ ctables_nest_uninit (&stack->nests[i]);
+ free (stack->nests);
}
}
-static struct var_array2
-nest_fts (struct var_array2 va0, struct var_array2 va1)
+static struct ctables_stack
+nest_fts (struct ctables_stack s0, struct ctables_stack s1)
{
- if (!va0.n)
- return va1;
- else if (!va1.n)
- return va0;
-
- struct var_array2 vaa = { .vas = xnmalloc (va0.n, va1.n * sizeof *vaa.vas) };
- for (size_t i = 0; i < va0.n; i++)
- for (size_t j = 0; j < va1.n; j++)
+ if (!s0.n)
+ return s1;
+ else if (!s1.n)
+ return s0;
+
+ struct ctables_stack stack = { .nests = xnmalloc (s0.n, s1.n * sizeof *stack.nests) };
+ for (size_t i = 0; i < s0.n; i++)
+ for (size_t j = 0; j < s1.n; j++)
{
- const struct var_array *a = &va0.vas[i];
- const struct var_array *b = &va1.vas[j];
+ const struct ctables_nest *a = &s0.nests[i];
+ const struct ctables_nest *b = &s1.nests[j];
size_t allocate = a->n + b->n;
struct variable **vars = xnmalloc (allocate, sizeof *vars);
vars[n++] = b->vars[k];
assert (n == allocate);
- const struct var_array *summary_src;
- if (!a->summary_var)
+ const struct ctables_nest *summary_src;
+ if (!a->specs[CSV_CELL].var)
summary_src = b;
- else if (!b->summary_var)
+ else if (!b->specs[CSV_CELL].var)
summary_src = a;
else
NOT_REACHED ();
- vaa.vas[vaa.n++] = (struct var_array) {
+
+ struct ctables_nest *new = &stack.nests[stack.n++];
+ *new = (struct ctables_nest) {
.vars = vars,
.scale_idx = (a->scale_idx != SIZE_MAX ? a->scale_idx
: b->scale_idx != SIZE_MAX ? a->n + b->scale_idx
: SIZE_MAX),
.n = n,
- .summaries = summary_src->summaries,
- .n_summaries = summary_src->n_summaries,
- .summary_var = summary_src->summary_var,
};
+ for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
+ ctables_summary_spec_set_clone (&new->specs[sv], &summary_src->specs[sv]);
}
- var_array2_uninit (&va0);
- var_array2_uninit (&va1);
- return vaa;
+ ctables_stack_uninit (&s0);
+ ctables_stack_uninit (&s1);
+ return stack;
}
-static struct var_array2
-stack_fts (struct var_array2 va0, struct var_array2 va1)
+static struct ctables_stack
+stack_fts (struct ctables_stack s0, struct ctables_stack s1)
{
- struct var_array2 vaa = { .vas = xnmalloc (va0.n + va1.n, sizeof *vaa.vas) };
- for (size_t i = 0; i < va0.n; i++)
- vaa.vas[vaa.n++] = va0.vas[i];
- for (size_t i = 0; i < va1.n; i++)
- vaa.vas[vaa.n++] = va1.vas[i];
- assert (vaa.n == va0.n + va1.n);
- free (va0.vas);
- free (va1.vas);
- return vaa;
+ struct ctables_stack stack = { .nests = xnmalloc (s0.n + s1.n, sizeof *stack.nests) };
+ for (size_t i = 0; i < s0.n; i++)
+ stack.nests[stack.n++] = s0.nests[i];
+ for (size_t i = 0; i < s1.n; i++)
+ stack.nests[stack.n++] = s1.nests[i];
+ assert (stack.n == s0.n + s1.n);
+ free (s0.nests);
+ free (s1.nests);
+ return stack;
}
-static struct var_array2
+static struct ctables_stack
enumerate_fts (enum pivot_axis_type axis_type, const struct ctables_axis *a)
{
if (!a)
- return (struct var_array2) { .n = 0 };
+ return (struct ctables_stack) { .n = 0 };
switch (a->op)
{
struct variable **vars = xmalloc (sizeof *vars);
*vars = a->var.var;
- struct var_array *va = xmalloc (sizeof *va);
- *va = (struct var_array) {
+ struct ctables_nest *nest = xmalloc (sizeof *nest);
+ *nest = (struct ctables_nest) {
.vars = vars,
.n = 1,
.scale_idx = a->scale ? 0 : SIZE_MAX,
};
- if (a->n_summaries || a->scale)
- {
- va->summaries = a->summaries;
- va->n_summaries = a->n_summaries;
- va->summary_var = a->var.var;
- }
- return (struct var_array2) { .vas = va, .n = 1 };
+ if (a->specs[CSV_CELL].n || a->scale)
+ for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
+ {
+ ctables_summary_spec_set_clone (&nest->specs[sv], &a->specs[sv]);
+ nest->specs[sv].var = a->var.var;
+ }
+ return (struct ctables_stack) { .nests = nest, .n = 1 };
case CTAO_STACK:
return stack_fts (enumerate_fts (axis_type, a->subs[0]),
const struct ctables_cell *a = *ap;
const struct ctables_cell *b = *bp;
- size_t a_idx = a->axes[aux->a].vaa_idx;
- size_t b_idx = b->axes[aux->a].vaa_idx;
+ size_t a_idx = a->axes[aux->a].stack_idx;
+ size_t b_idx = b->axes[aux->a].stack_idx;
if (a_idx != b_idx)
return a_idx < b_idx ? -1 : 1;
- const struct var_array *va = &aux->t->vaas[aux->a].vas[a_idx];
- for (size_t i = 0; i < va->n; i++)
- if (i != va->scale_idx)
+ const struct ctables_nest *nest = &aux->t->stacks[aux->a].nests[a_idx];
+ for (size_t i = 0; i < nest->n; i++)
+ if (i != nest->scale_idx)
{
- const struct variable *var = va->vars[i];
+ const struct variable *var = nest->vars[i];
const struct ctables_cell_value *a_cv = &a->axes[aux->a].cvs[i];
const struct ctables_cell_value *b_cv = &b->axes[aux->a].cvs[i];
if (a_cv->category != b_cv->category)
size_t hash = 0;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
- size_t idx = cell->axes[a].vaa_idx;
- const struct var_array *va = &t->vaas[a].vas[idx];
+ size_t idx = cell->axes[a].stack_idx;
+ const struct ctables_nest *nest = &t->stacks[a].nests[idx];
hash = hash_int (idx, hash);
- for (size_t i = 0; i < va->n_domains[domain]; i++)
+ for (size_t i = 0; i < nest->n_domains[domain]; i++)
{
- size_t v_idx = va->domains[domain][i];
+ size_t v_idx = nest->domains[domain][i];
hash = value_hash (&cell->axes[a].cvs[v_idx].value,
- var_get_width (va->vars[v_idx]), hash);
+ var_get_width (nest->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 = cell->axes[a].vaa_idx;
- if (idx != df->axes[a].vaa_idx)
+ size_t idx = cell->axes[a].stack_idx;
+ if (idx != df->axes[a].stack_idx)
goto not_equal;
- const struct var_array *va = &t->vaas[a].vas[idx];
- for (size_t i = 0; i < va->n_domains[domain]; i++)
+ const struct ctables_nest *nest = &t->stacks[a].nests[idx];
+ for (size_t i = 0; i < nest->n_domains[domain]; i++)
{
- size_t v_idx = va->domains[domain][i];
+ size_t v_idx = nest->domains[domain][i];
if (!value_equal (&df->axes[a].cvs[v_idx].value,
&cell->axes[a].cvs[v_idx].value,
- var_get_width (va->vars[v_idx])))
+ var_get_width (nest->vars[v_idx])))
goto not_equal;
}
}
: NULL);
}
-static void
+static struct ctables_cell *
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)
+ const struct ctables_category *cats[PIVOT_N_AXES][10])
{
- const struct var_array *ss = &t->vaas[t->summary_axis].vas[ix[t->summary_axis]];
+ const struct ctables_nest *ss = &t->stacks[t->summary_axis].nests[ix[t->summary_axis]];
size_t hash = 0;
+ enum ctables_summary_variant sv = CSV_CELL;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
- const struct var_array *va = &t->vaas[a].vas[ix[a]];
+ const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
hash = hash_int (ix[a], hash);
- for (size_t i = 0; i < va->n; i++)
- if (i != va->scale_idx)
+ for (size_t i = 0; i < nest->n; i++)
+ if (i != nest->scale_idx)
{
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);
+ hash = value_hash (case_data (c, nest->vars[i]),
+ var_get_width (nest->vars[i]), hash);
+ else
+ sv = CSV_TOTAL;
}
}
{
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
- const struct var_array *va = &t->vaas[a].vas[ix[a]];
- if (cell->axes[a].vaa_idx != ix[a])
+ const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ if (cell->axes[a].stack_idx != ix[a])
goto not_equal;
- for (size_t i = 0; i < va->n; i++)
- if (i != va->scale_idx
+ for (size_t i = 0; i < nest->n; i++)
+ if (i != nest->scale_idx
&& (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]),
+ && !value_equal (case_data (c, nest->vars[i]),
&cell->axes[a].cvs[i].value,
- var_get_width (va->vars[i])))))
+ var_get_width (nest->vars[i])))))
goto not_equal;
}
- goto summarize;
+ return cell;
not_equal: ;
}
cell = xmalloc (sizeof *cell);
cell->hide = false;
+ cell->sv = sv;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
{
- const struct var_array *va = &t->vaas[a].vas[ix[a]];
- cell->axes[a].vaa_idx = ix[a];
- cell->axes[a].cvs = (va->n
- ? xnmalloc (va->n, sizeof *cell->axes[a].cvs)
+ const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ cell->axes[a].stack_idx = ix[a];
+ cell->axes[a].cvs = (nest->n
+ ? xnmalloc (nest->n, sizeof *cell->axes[a].cvs)
: NULL);
- for (size_t i = 0; i < va->n; i++)
+ for (size_t i = 0; i < nest->n; i++)
{
- if (i != va->scale_idx)
+ if (i != nest->scale_idx)
{
const struct ctables_category *subtotal = cats[a][i]->subtotal;
if (subtotal && subtotal->type == CCT_HSUBTOTAL)
}
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]));
+ value_clone (&cell->axes[a].cvs[i].value, case_data (c, nest->vars[i]),
+ var_get_width (nest->vars[i]));
}
}
- cell->summaries = xmalloc (ss->n_summaries * sizeof *cell->summaries);
- for (size_t i = 0; i < ss->n_summaries; i++)
- ctables_summary_init (&cell->summaries[i], &ss->summaries[i]);
+
+ const struct ctables_summary_spec_set *specs = &ss->specs[cell->sv];
+ cell->summaries = xmalloc (specs->n * sizeof *cell->summaries);
+ for (size_t i = 0; i < specs->n; i++)
+ ctables_summary_init (&cell->summaries[i], &specs->specs[i]);
for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
cell->domains[dt] = ctables_domain_insert (t, cell, dt);
hmap_insert (&t->cells, &cell->node, hash);
+ return cell;
+}
-summarize:
- for (size_t i = 0; i < ss->n_summaries; i++)
- ctables_summary_add (&cell->summaries[i], &ss->summaries[i], ss->summary_var,
- case_data (c, ss->summary_var), weight);
+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)
+{
+ 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]];
+
+ 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);
for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
cell->domains[dt]->valid += weight;
}
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)
+ enum pivot_axis_type start_axis, size_t start_nest)
{
- for (enum pivot_axis_type a = start_a; a < PIVOT_N_AXES; a++)
+ for (enum pivot_axis_type a = start_axis; 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++)
+ const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ for (size_t i = start_nest; i < nest->n; i++)
{
- if (i == va->scale_idx)
+ if (i == nest->scale_idx)
continue;
- const struct variable *var = va->vars[i];
+ const struct variable *var = nest->vars[i];
const struct ctables_category *total = ctables_categories_total (
t->categories[var_get_dict_index (var)]);
{
const struct ctables_category *save = cats[a][i];
cats[a][i] = total;
- ctables_cell_insert__ (t, c, ix, cats, weight);
+ ctables_cell_add__ (t, c, ix, cats, weight);
recurse_totals (t, c, ix, cats, weight, a, i + 1);
cats[a][i] = save;
}
}
- start_va = 0;
+ start_nest = 0;
}
}
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++)
+ const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ for (size_t i = 0; i < nest->n; i++)
{
- if (i == va->scale_idx)
+ if (i == nest->scale_idx)
continue;
- const struct variable *var = va->vars[i];
+ const struct variable *var = nest->vars[i];
const union value *value = case_data (c, var);
if (var_is_numeric (var) && value->f == SYSMIS)
}
}
- ctables_cell_insert__ (t, c, ix, cats, weight);
+ ctables_cell_add__ (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++)
+ const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ for (size_t i = 0; i < nest->n; i++)
{
- if (i == va->scale_idx)
+ if (i == nest->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);
+ ctables_cell_add__ (t, c, ix, cats, weight);
cats[a][i] = save;
}
}
}
}
+struct merge_item
+ {
+ size_t tiebreaker;
+ const struct ctables_summary_spec_set *set;
+ size_t ofs;
+ };
+
+static int
+merge_item_compare_3way (const struct merge_item *a, const struct merge_item *b)
+{
+ const struct ctables_summary_spec *as = &a->set->specs[a->ofs];
+ const struct ctables_summary_spec *bs = &b->set->specs[b->ofs];
+ if (as->function != bs->function)
+ return as->function > bs->function ? 1 : -1;
+ else if (as->percentile != bs->percentile)
+ return as->percentile < bs->percentile ? 1 : -1;
+ return strcmp (as->label, bs->label);
+}
+
static bool
ctables_execute (struct dataset *ds, struct ctables *ct)
{
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
if (t->axes[a])
{
- t->vaas[a] = enumerate_fts (a, t->axes[a]);
+ t->stacks[a] = enumerate_fts (a, t->axes[a]);
- for (size_t j = 0; j < t->vaas[a].n; j++)
+ for (size_t j = 0; j < t->stacks[a].n; j++)
{
- struct var_array *va = &t->vaas[a].vas[j];
+ struct ctables_nest *nest = &t->stacks[a].nests[j];
for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
{
- va->domains[dt] = xmalloc (va->n * sizeof *va->domains[dt]);
- va->n_domains[dt] = 0;
+ nest->domains[dt] = xmalloc (nest->n * sizeof *nest->domains[dt]);
+ nest->n_domains[dt] = 0;
- for (size_t k = 0; k < va->n; k++)
+ for (size_t k = 0; k < nest->n; k++)
{
- if (k == va->scale_idx)
+ if (k == nest->scale_idx)
continue;
switch (dt)
: dt == CTDT_ROW ? a == PIVOT_AXIS_COLUMN
: a == PIVOT_AXIS_ROW)
{
- if (k == va->n - 1
- || (va->scale_idx == va->n - 1
- && k == va->n - 2))
+ if (k == nest->n - 1
+ || (nest->scale_idx == nest->n - 1
+ && k == nest->n - 2))
continue;
}
break;
break;
}
- va->domains[dt][va->n_domains[dt]++] = k;
+ nest->domains[dt][nest->n_domains[dt]++] = k;
}
}
}
}
else
{
- struct var_array *va = xmalloc (sizeof *va);
- *va = (struct var_array) { .n = 0 };
- t->vaas[a] = (struct var_array2) { .vas = va, .n = 1 };
+ struct ctables_nest *nest = xmalloc (sizeof *nest);
+ *nest = (struct ctables_nest) { .n = 0 };
+ t->stacks[a] = (struct ctables_stack) { .nests = nest, .n = 1 };
}
- for (size_t i = 0; i < t->vaas[t->summary_axis].n; i++)
+ struct ctables_stack *stack = &t->stacks[t->summary_axis];
+ for (size_t i = 0; i < stack->n; i++)
{
- struct var_array *va = &t->vaas[t->summary_axis].vas[i];
- if (!va->n_summaries)
+ struct ctables_nest *nest = &stack->nests[i];
+ if (!nest->specs[CSV_CELL].n)
{
- va->summaries = xmalloc (sizeof *va->summaries);
- va->n_summaries = 1;
+ struct ctables_summary_spec_set *specs = &nest->specs[CSV_CELL];
+ specs->specs = xmalloc (sizeof *specs->specs);
+ specs->n = 1;
enum ctables_summary_function function
- = va->summary_var ? CTSF_MEAN : CTSF_COUNT;
- struct ctables_var var = { .is_mrset = false, .var = va->summary_var };
+ = specs->var ? CTSF_MEAN : CTSF_COUNT;
+ struct ctables_var var = { .is_mrset = false, .var = specs->var };
- *va->summaries = (struct ctables_summary_spec) {
+ *specs->specs = (struct ctables_summary_spec) {
.function = function,
.format = ctables_summary_default_format (function, &var),
.label = ctables_summary_default_label (function, 0),
};
- if (!va->summary_var)
- va->summary_var = va->vars[0];
+ if (!specs->var)
+ specs->var = nest->vars[0];
+
+ ctables_summary_spec_set_clone (&nest->specs[CSV_TOTAL],
+ &nest->specs[CSV_CELL]);
+ }
+ else if (!nest->specs[CSV_TOTAL].n)
+ ctables_summary_spec_set_clone (&nest->specs[CSV_TOTAL],
+ &nest->specs[CSV_CELL]);
+ }
+
+ struct ctables_summary_spec_set merged = { .n = 0 };
+ struct merge_item *items = xnmalloc (2 * stack->n, sizeof *items);
+ size_t n_left = 0;
+ for (size_t j = 0; j < stack->n; j++)
+ {
+ const struct ctables_nest *nest = &stack->nests[j];
+ if (!nest->n)
+ continue;
+
+ for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
+ {
+ items[n_left] = (struct merge_item) {
+ .tiebreaker = n_left,
+ .set = &nest->specs[sv]
+ };
+ n_left++;
+ }
+ }
+
+ while (n_left > 0)
+ {
+ struct merge_item min = items[0];
+ for (size_t j = 1; j < n_left; j++)
+ if (merge_item_compare_3way (&items[j], &min) < 0)
+ min = items[j];
+
+ /* XXX Add to 'merged' */
+ if (merged.n >= merged.allocated)
+ merged.specs = x2nrealloc (merged.specs, &merged.allocated,
+ sizeof *merged.specs);
+ merged.specs[merged.n++] = min.set->specs[min.ofs];
+
+ for (size_t j = 0; j < n_left; )
+ {
+ if (merge_item_compare_3way (&items[j], &min) == 0)
+ {
+ struct merge_item *item = &items[j];
+ item->set->specs[item->ofs].axis_idx = merged.n - 1;
+ if (++item->ofs >= item->set->n)
+ {
+ items[j] = items[--n_left];
+ continue;
+ }
+ }
+ j++;
+ }
+ }
+
+ for (size_t j = 0; j < merged.n; j++)
+ printf ("%s\n", ctables_summary_function_name (merged.specs[j].function));
+
+ for (size_t j = 0; j < stack->n; j++)
+ {
+ const struct ctables_nest *nest = &stack->nests[j];
+ for (enum ctables_summary_variant sv = 0; sv < N_CSVS; sv++)
+ {
+ const struct ctables_summary_spec_set *specs = &nest->specs[sv];
+ for (size_t k = 0; k < specs->n; k++)
+ printf ("(%s, %zu) ", ctables_summary_function_name (specs->specs[k].function),
+ specs->specs[k].axis_idx);
+ printf ("\n");
}
}
}
{
struct ctables_table *t = ct->tables[i];
- for (size_t ir = 0; ir < t->vaas[PIVOT_AXIS_ROW].n; ir++)
- for (size_t ic = 0; ic < t->vaas[PIVOT_AXIS_COLUMN].n; ic++)
- for (size_t il = 0; il < t->vaas[PIVOT_AXIS_LAYER].n; il++)
+ 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);
}
}
sort (sorted, n, sizeof *sorted, ctables_cell_compare_3way, &aux);
size_t max_depth = 0;
- for (size_t j = 0; j < t->vaas[a].n; j++)
- if (t->vaas[a].vas[j].n > max_depth)
- max_depth = t->vaas[a].vas[j].n;
+ for (size_t j = 0; j < t->stacks[a].n; j++)
+ if (t->stacks[a].nests[j].n > max_depth)
+ max_depth = t->stacks[a].nests[j].n;
struct pivot_category **groups = xnmalloc (max_depth, sizeof *groups);
struct pivot_category *top = NULL;
for (size_t j = 0; j < n; j++)
{
struct ctables_cell *cell = sorted[j];
- const struct var_array *va = &t->vaas[a].vas[cell->axes[a].vaa_idx];
+ const struct ctables_nest *nest = &t->stacks[a].nests[cell->axes[a].stack_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 == cell->axes[a].vaa_idx)
+ if (prev->axes[a].stack_idx == cell->axes[a].stack_idx)
{
- for (; n_common < va->n; n_common++)
- if (n_common != va->scale_idx
+ for (; n_common < nest->n; n_common++)
+ if (n_common != nest->scale_idx
&& (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]))))
+ var_get_type (nest->vars[n_common]))))
break;
}
else
if (new_subtable)
{
- enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (va->vars[0])];
+ enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (nest->vars[0])];
top = d[a]->root;
if (vlabel != CTVL_NONE)
top = pivot_category_create_group__ (
- top, pivot_value_new_variable (va->vars[0]));
+ top, pivot_value_new_variable (nest->vars[0]));
}
- if (n_common == va->n)
+ if (n_common == nest->n)
{
cell->axes[a].leaf = prev_leaf;
continue;
}
- for (size_t k = n_common; k < va->n; k++)
+ for (size_t k = n_common; k < nest->n; k++)
{
struct pivot_category *parent = k > 0 ? groups[k - 1] : top;
struct pivot_value *label
- = (k == va->scale_idx ? NULL
+ = (k == nest->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],
+ : pivot_value_new_var_value (nest->vars[k],
&cell->axes[a].cvs[k].value));
- if (k == va->n - 1)
+ if (k == nest->n - 1)
{
if (a == t->summary_axis)
{
if (label)
parent = pivot_category_create_group__ (parent, label);
- for (size_t m = 0; m < va->n_summaries; m++)
+ const struct ctables_summary_spec_set *specs = &nest->specs[cell->sv];
+ for (size_t m = 0; m < specs->n; m++)
{
int leaf = pivot_category_create_leaf (
- parent, pivot_value_new_text (va->summaries[m].label));
+ parent, pivot_value_new_text (specs->specs[m].label));
if (m == 0)
prev_leaf = leaf;
}
if (label)
parent = pivot_category_create_group__ (parent, label);
- enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (va->vars[k + 1])];
+ enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (nest->vars[k + 1])];
if (vlabel != CTVL_NONE)
parent = pivot_category_create_group__ (
- parent, pivot_value_new_variable (va->vars[k + 1]));
+ parent, pivot_value_new_variable (nest->vars[k + 1]));
groups[k] = parent;
}
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++)
+ const struct ctables_nest *nest = &t->stacks[t->summary_axis].nests[cell->axes[t->summary_axis].stack_idx];
+ const struct ctables_summary_spec_set *specs = &nest->specs[cell->sv];
+ for (size_t j = 0; j < specs->n; j++)
{
size_t dindexes[3];
size_t n_dindexes = 0;
dindexes[n_dindexes++] = leaf;
}
- double d = ctables_summary_value (cell, &cell->summaries[j], &ss->summaries[j]);
+ double d = ctables_summary_value (cell, &cell->summaries[j], &specs->specs[j]);
struct pivot_value *value = pivot_value_new_number (d);
- value->numeric.format = ss->summaries[j].format;
+ value->numeric.format = specs->specs[j].format;
pivot_table_put (pt, dindexes, n_dindexes, value);
}
}
projects / pspp / blobdiff