{
struct hmap_node node;
- const struct ctables_freq *example;
+ const struct ctables_cell *example;
double valid;
double missing;
};
-struct ctables_freq
+struct ctables_cell
{
- /* In struct ctables's 'ft' hmap. Indexed by all the values in all the
+ /* In struct ctables's 'cells' hmap. Indexed by all the values in all the
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;
+ bool total;
+
struct
{
- size_t vaa_idx;
- union value *values;
+ size_t stack_idx;
+ struct ctables_cell_value
+ {
+ const struct ctables_category *category;
+ union value value;
+ }
+ *cvs;
int leaf;
}
axes[PIVOT_N_AXES];
CTLP_LAYER,
};
-struct var_array
+struct ctables_summary_spec_set
+ {
+ struct ctables_summary_spec *summaries;
+ size_t n;
+ size_t allocated;
+
+ struct variable *var;
+ };
+
+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 cell_sss;
+ struct ctables_summary_spec_set total_sss;
};
-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 ft;
+ struct hmap cells;
struct hmap domains[N_CTDTS];
enum pivot_axis_type slabels_position;
struct ctables_categories
{
size_t n_refs;
-
- /* Explicit categories. */
- struct ctables_cat_value *values;
- size_t n_values;
-
- /* Implicit categories. */
- bool sort_ascending;
- bool include_missing;
- enum { CTCS_VALUE, CTCS_LABEL, CTCS_FUNCTION } key;
- enum ctables_summary_function sort_func;
- struct variable *sort_func_var;
- double percentile;
-
- /* Totals. */
- bool show_totals;
- bool totals_before;
- char *total_label;
-
- /* Empty categories. */
+ struct ctables_category *cats;
+ size_t n_cats;
bool show_empty;
};
-struct ctables_cat_value
+struct ctables_category
{
- enum ctables_cat_value_type
+ enum ctables_category_type
{
- CCVT_NUMBER,
- CCVT_STRING,
- CCVT_RANGE,
- CCVT_MISSING,
- CCVT_OTHERNM,
- CCVT_SUBTOTAL,
- CCVT_HSUBTOTAL,
+ CCT_NUMBER,
+ CCT_STRING,
+ CCT_RANGE,
+ CCT_MISSING,
+ CCT_OTHERNM,
+
+ CCT_SUBTOTAL,
+ CCT_HSUBTOTAL,
+ CCT_TOTAL,
+
+ CCT_VALUE,
+ CCT_LABEL,
+ CCT_FUNCTION,
}
type;
+ struct ctables_category *subtotal;
+
union
{
- double number; /* CCVT_NUMBER. */
- char *string; /* CCVT_STRING. */
- double range[2]; /* CCVT_RANGE. */
- char *subtotal_label; /* CCVT_SUBTOTAL, CCVT_HSUBTOTAL. */
+ double number; /* CCT_NUMBER. */
+ char *string; /* CCT_STRING. */
+ double range[2]; /* CCT_RANGE. */
+ char *total_label; /* CCT_SUBTOTAL, CCT_HSUBTOTAL, CCT_TOTAL. */
+
+ /* CCT_VALUE, CCT_LABEL, CCT_FUNCTION. */
+ struct
+ {
+ bool include_missing;
+ bool sort_ascending;
+
+ /* CCT_FUNCTION. */
+ enum ctables_summary_function sort_function;
+ struct variable *sort_var;
+ double percentile;
+ };
};
};
-static const struct ctables_cat_value *ctables_categories_match (
- const struct ctables_categories *, const union value *,
- const struct variable *);
-
static void
-ctables_cat_value_uninit (struct ctables_cat_value *cv)
+ctables_category_uninit (struct ctables_category *cat)
{
- if (!cv)
+ if (!cat)
return;
- switch (cv->type)
+ switch (cat->type)
{
- case CCVT_NUMBER:
- case CCVT_RANGE:
- case CCVT_MISSING:
- case CCVT_OTHERNM:
+ case CCT_NUMBER:
+ case CCT_RANGE:
+ case CCT_MISSING:
+ case CCT_OTHERNM:
+ break;
+
+ case CCT_STRING:
+ free (cat->string);
break;
- case CCVT_STRING:
- free (cv->string);
+ case CCT_SUBTOTAL:
+ case CCT_HSUBTOTAL:
+ case CCT_TOTAL:
+ free (cat->total_label);
break;
- case CCVT_SUBTOTAL:
- case CCVT_HSUBTOTAL:
- free (cv->subtotal_label);
+ case CCT_VALUE:
+ case CCT_LABEL:
+ case CCT_FUNCTION:
+ break;
}
}
if (--c->n_refs)
return;
- for (size_t i = 0; i < c->n_values; i++)
- ctables_cat_value_uninit (&c->values[i]);
- free (c->values);
- free (c->total_label);
+ for (size_t i = 0; i < c->n_cats; i++)
+ ctables_category_uninit (&c->cats[i]);
+ free (c->cats);
free (c);
}
{
struct ctables_var var;
bool scale;
- struct ctables_summary_spec *summaries;
- size_t n_summaries;
- size_t allocated_summaries;
+ struct ctables_summary_spec_set cell_sss;
+ struct ctables_summary_spec_set total_sss;
};
/* Nonterminals. */
free (s->label);
}
+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->summaries[i]);
+ free (set->summaries);
+}
+
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);
+ ctables_summary_spec_set_uninit (&axis->cell_sss);
+ ctables_summary_spec_set_uninit (&axis->total_sss);
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, bool totals)
{
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 = (totals ? &axis->total_sss
+ : &axis->cell_sss);
+ if (set->n >= set->allocated)
+ set->summaries = x2nrealloc (set->summaries, &set->allocated,
+ sizeof *set->summaries);
+
+ struct ctables_summary_spec *dst = &set->summaries[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, totals))
return false;
return true;
}
if (!sub || !lex_match (ctx->lexer, T_LBRACK))
return sub;
- do
+ bool totals = false;
+ for (;;)
{
int start_ofs = lex_ofs (ctx->lexer);
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);
+ add_summary_spec (sub, function, percentile, label, formatp, loc,
+ totals);
free (label);
msg_location_destroy (loc);
- lex_match (ctx->lexer, T_COMMA);
+ if (lex_match (ctx->lexer, T_COMMA))
+ {
+ if (!totals && lex_match_id (ctx->lexer, "TOTALS"))
+ {
+ if (!lex_force_match (ctx->lexer, T_LBRACK))
+ goto error;
+ totals = true;
+ }
+ }
+ else if (lex_force_match (ctx->lexer, T_RBRACK))
+ {
+ if (totals && !lex_force_match (ctx->lexer, T_RBRACK))
+ goto error;
+ return sub;
+ }
+ else
+ goto error;
}
- 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->cell_sss.n ? axis : NULL;
else
{
for (size_t i = 0; i < 2; i++)
free (ct);
}
-static struct ctables_cat_value
-ccvt_range (double low, double high)
+static struct ctables_category
+cct_range (double low, double high)
{
- return (struct ctables_cat_value) {
- .type = CCVT_RANGE,
+ return (struct ctables_category) {
+ .type = CCT_RANGE,
.range = { low, high }
};
}
}
free (vars);
+ size_t allocated_cats = 0;
if (lex_match (lexer, T_LBRACK))
{
- size_t allocated_values = 0;
do
{
- if (c->n_values >= allocated_values)
- c->values = x2nrealloc (c->values, &allocated_values,
- sizeof *c->values);
+ if (c->n_cats >= allocated_cats)
+ c->cats = x2nrealloc (c->cats, &allocated_cats, sizeof *c->cats);
- struct ctables_cat_value *v = &c->values[c->n_values];
+ struct ctables_category *cat = &c->cats[c->n_cats];
if (lex_match_id (lexer, "OTHERNM"))
- v->type = CCVT_OTHERNM;
+ cat->type = CCT_OTHERNM;
else if (lex_match_id (lexer, "MISSING"))
- v->type = CCVT_MISSING;
+ cat->type = CCT_MISSING;
else if (lex_match_id (lexer, "SUBTOTAL"))
- *v = (struct ctables_cat_value)
- { .type = CCVT_SUBTOTAL, .subtotal_label = NULL };
+ *cat = (struct ctables_category)
+ { .type = CCT_SUBTOTAL, .total_label = NULL };
else if (lex_match_id (lexer, "HSUBTOTAL"))
- *v = (struct ctables_cat_value)
- { .type = CCVT_HSUBTOTAL, .subtotal_label = NULL };
+ *cat = (struct ctables_category)
+ { .type = CCT_HSUBTOTAL, .total_label = NULL };
else if (lex_match_id (lexer, "LO"))
{
if (!lex_force_match_id (lexer, "THRU") || lex_force_num (lexer))
return false;
- *v = ccvt_range (-DBL_MAX, lex_number (lexer));
+ *cat = cct_range (-DBL_MAX, lex_number (lexer));
lex_get (lexer);
}
else if (lex_is_number (lexer))
lex_get (lexer);
if (lex_match_id (lexer, "THRU"))
{
- v->type = CCVT_RANGE;
- v->range[0] = number;
+ cat->type = CCT_RANGE;
+ cat->range[0] = number;
if (lex_match_id (lexer, "HI"))
- *v = ccvt_range (number, DBL_MAX);
+ *cat = cct_range (number, DBL_MAX);
else
{
if (!lex_force_num (lexer))
return false;
- *v = ccvt_range (number, lex_number (lexer));
+ *cat = cct_range (number, lex_number (lexer));
lex_get (lexer);
}
}
else
- *v = (struct ctables_cat_value) {
- .type = CCVT_NUMBER,
+ *cat = (struct ctables_category) {
+ .type = CCT_NUMBER,
.number = number
};
}
else if (lex_is_string (lexer))
{
- *v = (struct ctables_cat_value) {
- .type = CCVT_STRING,
+ *cat = (struct ctables_category) {
+ .type = CCT_STRING,
.string = ss_xstrdup (lex_tokss (lexer)),
};
lex_get (lexer);
return false;
}
- if ((v->type == CCVT_SUBTOTAL || v->type == CCVT_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;
- v->subtotal_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_values++;
+ c->n_cats++;
lex_match (lexer, T_COMMA);
}
while (!lex_match (lexer, T_RBRACK));
}
+ struct ctables_category cat = {
+ .type = CCT_VALUE,
+ .include_missing = false,
+ .sort_ascending = true,
+ };
+ bool show_totals = false;
+ char *total_label = NULL;
+ bool totals_before = false;
while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
{
- if (!c->n_values && lex_match_id (lexer, "ORDER"))
+ if (!c->n_cats && lex_match_id (lexer, "ORDER"))
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "A"))
- c->sort_ascending = true;
+ cat.sort_ascending = true;
else if (lex_match_id (lexer, "D"))
- c->sort_ascending = false;
+ cat.sort_ascending = false;
else
{
lex_error_expecting (lexer, "A", "D");
return false;
}
}
- else if (!c->n_values && lex_match_id (lexer, "KEY"))
+ else if (!c->n_cats && lex_match_id (lexer, "KEY"))
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "VALUE"))
- c->key = CTCS_VALUE;
+ cat.type = CCT_VALUE;
else if (lex_match_id (lexer, "LABEL"))
- c->key = CTCS_LABEL;
+ cat.type = CCT_LABEL;
else
{
- c->key = CTCS_FUNCTION;
- if (!parse_ctables_summary_function (lexer, &c->sort_func))
+ cat.type = CCT_FUNCTION;
+ if (!parse_ctables_summary_function (lexer, &cat.sort_function))
return false;
if (lex_match (lexer, T_LPAREN))
{
- c->sort_func_var = parse_variable (lexer, dict);
- if (!c->sort_func_var)
+ cat.sort_var = parse_variable (lexer, dict);
+ if (!cat.sort_var)
return false;
- if (c->sort_func == CTSF_PTILE)
+ if (cat.sort_function == CTSF_PTILE)
{
lex_match (lexer, T_COMMA);
if (!lex_force_num_range_closed (lexer, "PTILE", 0, 100))
return false;
- c->percentile = lex_number (lexer);
+ cat.percentile = lex_number (lexer);
lex_get (lexer);
}
if (!lex_force_match (lexer, T_RPAREN))
return false;
}
- else if (ctables_function_availability (c->sort_func)
+ else if (ctables_function_availability (cat.sort_function)
== CTFA_SCALE)
{
bool UNUSED b = lex_force_match (lexer, T_LPAREN);
}
}
}
- else if (!c->n_values && lex_match_id (lexer, "MISSING"))
+ else if (!c->n_cats && lex_match_id (lexer, "MISSING"))
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "INCLUDE"))
- c->include_missing = true;
+ cat.include_missing = true;
else if (lex_match_id (lexer, "EXCLUDE"))
- c->include_missing = false;
+ cat.include_missing = false;
else
{
lex_error_expecting (lexer, "INCLUDE", "EXCLUDE");
else if (lex_match_id (lexer, "TOTAL"))
{
lex_match (lexer, T_EQUALS);
- if (!parse_bool (lexer, &c->show_totals))
+ if (!parse_bool (lexer, &show_totals))
return false;
}
else if (lex_match_id (lexer, "LABEL"))
lex_match (lexer, T_EQUALS);
if (!lex_force_string (lexer))
return false;
- free (c->total_label);
- c->total_label = ss_xstrdup (lex_tokss (lexer));
+ free (total_label);
+ total_label = ss_xstrdup (lex_tokss (lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "POSITION"))
{
lex_match (lexer, T_EQUALS);
if (lex_match_id (lexer, "BEFORE"))
- c->totals_before = true;
+ totals_before = true;
else if (lex_match_id (lexer, "AFTER"))
- c->totals_before = false;
+ totals_before = false;
else
{
lex_error_expecting (lexer, "BEFORE", "AFTER");
}
else
{
- if (!c->n_values)
+ if (!c->n_cats)
lex_error_expecting (lexer, "ORDER", "KEY", "MISSING",
"TOTAL", "LABEL", "POSITION", "EMPTY");
else
return false;
}
}
+
+ if (!c->n_cats)
+ {
+ if (c->n_cats >= allocated_cats)
+ c->cats = x2nrealloc (c->cats, &allocated_cats,
+ sizeof *c->cats);
+ c->cats[c->n_cats++] = cat;
+ }
+
+ if (show_totals)
+ {
+ if (c->n_cats >= allocated_cats)
+ c->cats = x2nrealloc (c->cats, &allocated_cats, sizeof *c->cats);
+
+ struct ctables_category *totals;
+ if (totals_before)
+ {
+ insert_element (c->cats, c->n_cats, sizeof *c->cats, 0);
+ totals = &c->cats[0];
+ }
+ else
+ totals = &c->cats[c->n_cats];
+ c->n_cats++;
+
+ *totals = (struct ctables_category) {
+ .type = CCT_TOTAL,
+ .total_label = total_label ? total_label : xstrdup (_("Total")),
+ };
+ }
+
+ 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 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->cell_sss.var)
summary_src = b;
- else if (!b->summary_var)
+ else if (!b->cell_sss.var)
summary_src = a;
else
NOT_REACHED ();
- vaa.vas[vaa.n++] = (struct var_array) {
+ stack.nests[stack.n++] = (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,
+ .cell_sss = summary_src->cell_sss,
+ .total_sss = summary_src->total_sss,
};
}
- 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)
+ if (a->cell_sss.n || a->scale)
{
- va->summaries = a->summaries;
- va->n_summaries = a->n_summaries;
- va->summary_var = a->var.var;
+ nest->cell_sss = a->cell_sss;
+ nest->total_sss = a->total_sss;
+ nest->cell_sss.var = a->var.var;
+ nest->total_sss.var = a->var.var;
}
- return (struct var_array2) { .vas = va, .n = 1 };
+ return (struct ctables_stack) { .nests = nest, .n = 1 };
case CTAO_STACK:
return stack_fts (enumerate_fts (axis_type, a->subs[0]),
}
static double
-ctables_summary_value (const struct ctables_freq *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:
NOT_REACHED ();
}
-struct ctables_freq_sort_aux
+struct ctables_cell_sort_aux
{
const struct ctables_table *t;
enum pivot_axis_type a;
};
static int
-ctables_freq_compare_3way (const void *a_, const void *b_, const void *aux_)
+ctables_cell_compare_3way (const void *a_, const void *b_, const void *aux_)
{
- const struct ctables_freq_sort_aux *aux = aux_;
- struct ctables_freq *const *ap = a_;
- struct ctables_freq *const *bp = b_;
- const struct ctables_freq *a = *ap;
- const struct ctables_freq *b = *bp;
-
- size_t a_idx = a->axes[aux->a].vaa_idx;
- size_t b_idx = b->axes[aux->a].vaa_idx;
+ const struct ctables_cell_sort_aux *aux = aux_;
+ struct ctables_cell *const *ap = a_;
+ struct ctables_cell *const *bp = b_;
+ const struct ctables_cell *a = *ap;
+ const struct ctables_cell *b = *bp;
+
+ 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 union value *val_a = &a->axes[aux->a].values[i];
- const union value *val_b = &b->axes[aux->a].values[i];
- int cmp = value_compare_3way (val_a, val_b, var_get_width (var));
- if (!cmp)
- continue;
-
- const struct ctables_categories *cats = aux->t->categories[var_get_dict_index (var)];
- if (!cats)
- return cmp;
- else if (cats->n_values)
- {
- const struct ctables_cat_value *a_cv = ctables_categories_match (cats, val_a, var);
- const struct ctables_cat_value *b_cv = ctables_categories_match (cats, val_b, var);
- assert (a_cv && b_cv);
- return (a_cv == b_cv ? cmp
- : a_cv > b_cv ? 1
- : -1);
- }
- else
+ 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)
+ return a_cv->category > b_cv->category ? 1 : -1;
+
+ const union value *a_val = &a_cv->value;
+ const union value *b_val = &b_cv->value;
+ switch (a_cv->category->type)
{
- switch (cats->key)
- {
- case CTCS_VALUE:
- /* Nothing to do. */
- break;
+ case CCT_NUMBER:
+ case CCT_STRING:
+ case CCT_SUBTOTAL:
+ case CCT_HSUBTOTAL:
+ case CCT_TOTAL:
+ /* Must be equal. */
+ continue;
- case CTCS_LABEL:
- {
- const char *a_label = var_lookup_value_label (var, val_a);
- const char *b_label = var_lookup_value_label (var, val_b);
- int label_cmp = (a_label
- ? (b_label ? strcmp (a_label, b_label) : 1)
- : (b_label ? -1 : 0));
- if (label_cmp)
- cmp = label_cmp;
- }
- break;
+ case CCT_RANGE:
+ case CCT_MISSING:
+ case CCT_OTHERNM:
+ {
+ int cmp = value_compare_3way (a_val, b_val, var_get_width (var));
+ if (cmp)
+ return cmp;
+ }
+ break;
- case CTCS_FUNCTION:
- NOT_REACHED ();
- }
+ case CCT_VALUE:
+ {
+ int cmp = value_compare_3way (a_val, b_val, var_get_width (var));
+ if (cmp)
+ return a_cv->category->sort_ascending ? cmp : -cmp;
+ }
+ break;
- return cats->sort_ascending ? cmp : -cmp;
+ case CCT_LABEL:
+ {
+ const char *a_label = var_lookup_value_label (var, a_val);
+ const char *b_label = var_lookup_value_label (var, b_val);
+ int cmp = (a_label
+ ? (b_label ? strcmp (a_label, b_label) : 1)
+ : (b_label ? -1 : value_compare_3way (
+ a_val, b_val, var_get_width (var))));
+ if (cmp)
+ return a_cv->category->sort_ascending ? cmp : -cmp;
+ }
+ break;
+
+ case CCT_FUNCTION:
+ NOT_REACHED ();
}
}
return 0;
*/
static struct ctables_domain *
-ctables_domain_insert (struct ctables_table *t, struct ctables_freq *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;
- 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];
- hash = value_hash (&f->axes[a].values[v_idx],
- var_get_width (va->vars[v_idx]), hash);
+ size_t v_idx = nest->domains[domain][i];
+ hash = value_hash (&cell->axes[a].cvs[v_idx].value,
+ var_get_width (nest->vars[v_idx]), hash);
}
}
struct ctables_domain *d;
HMAP_FOR_EACH_WITH_HASH (d, struct ctables_domain, node, hash, &t->domains[domain])
{
- const struct ctables_freq *df = d->example;
+ 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;
- 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];
- if (!value_equal (&df->axes[a].values[v_idx],
- &f->axes[a].values[v_idx],
- var_get_width (va->vars[v_idx])))
+ 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 (nest->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;
}
-static const struct ctables_cat_value *
-ctables_categories_match (const struct ctables_categories *cats,
+static const struct ctables_category *
+ctables_categories_match (const struct ctables_categories *c,
const union value *v, const struct variable *var)
{
- const struct ctables_cat_value *othernm = NULL;
- for (size_t i = cats->n_values; i-- > 0; )
+ const struct ctables_category *othernm = NULL;
+ for (size_t i = c->n_cats; i-- > 0; )
{
- const struct ctables_cat_value *cv = &cats->values[i];
- switch (cv->type)
+ const struct ctables_category *cat = &c->cats[i];
+ switch (cat->type)
{
- case CCVT_NUMBER:
- if (cv->number == v->f)
- return cv;
+ case CCT_NUMBER:
+ if (cat->number == v->f)
+ return cat;
break;
- case CCVT_STRING:
+ case CCT_STRING:
NOT_REACHED ();
- case CCVT_RANGE:
- if ((cv->range[0] == -DBL_MAX || v->f >= cv->range[0])
- && (cv->range[1] == DBL_MAX || v->f <= cv->range[1]))
- return cv;
+ case CCT_RANGE:
+ if ((cat->range[0] == -DBL_MAX || v->f >= cat->range[0])
+ && (cat->range[1] == DBL_MAX || v->f <= cat->range[1]))
+ return cat;
break;
- case CCVT_MISSING:
+ case CCT_MISSING:
if (var_is_value_missing (var, v))
- return cv;
+ return cat;
break;
- case CCVT_OTHERNM:
+ case CCT_OTHERNM:
if (!othernm)
- othernm = cv;
+ othernm = cat;
break;
- case CCVT_SUBTOTAL:
- case CCVT_HSUBTOTAL:
+ case CCT_SUBTOTAL:
+ case CCT_HSUBTOTAL:
+ case CCT_TOTAL:
break;
+
+ case CCT_VALUE:
+ case CCT_LABEL:
+ case CCT_FUNCTION:
+ return (cat->include_missing || !var_is_value_missing (var, v) ? cat
+ : NULL);
}
}
return var_is_value_missing (var, v) ? NULL : othernm;
}
-static void
-ctables_freqtab_insert (struct ctables_table *t,
- const struct ccase *c,
- size_t ir, size_t ic, size_t il,
- double weight)
+static const struct ctables_category *
+ctables_categories_total (const struct ctables_categories *c)
{
- 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]];
-
- 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);
-
- enum mv_class missing = var_is_value_missing (var, value);
- if (missing == MV_SYSTEM)
- return;
+ 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);
+}
- const struct ctables_categories *cats = t->categories[var_get_dict_index (var)];
- if (!cats)
- {
- if (missing)
- return;
- }
- else if (cats->n_values)
- {
- if (!ctables_categories_match (cats, value, var))
- return;
- }
- else
- {
- if (missing && !cats->include_missing)
- return;
- }
- }
- }
+static void
+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_nest *ss = &t->stacks[t->summary_axis].nests[ix[t->summary_axis]];
size_t hash = 0;
+ bool total = false;
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)
- hash = value_hash (case_data (c, va->vars[i]),
- var_get_width (va->vars[i]), hash);
+ 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, nest->vars[i]),
+ var_get_width (nest->vars[i]), hash);
+ else
+ total = true;
+ }
}
- struct ctables_freq *f;
- HMAP_FOR_EACH_WITH_HASH (f, struct ctables_freq, node, hash, &t->ft)
+ 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])
+ 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
- && !value_equal (case_data (c, va->vars[i]),
- &f->axes[a].values[i],
- var_get_width (va->vars[i])))
+ 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, nest->vars[i]),
+ &cell->axes[a].cvs[i].value,
+ var_get_width (nest->vars[i])))))
goto not_equal;
}
not_equal: ;
}
- f = xmalloc (sizeof *f);
+ cell = xmalloc (sizeof *cell);
+ cell->hide = false;
+ cell->total = total;
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].values = (va->n
- ? xnmalloc (va->n, sizeof *f->axes[a].values)
- : NULL);
- for (size_t i = 0; i < va->n; i++)
- value_clone (&f->axes[a].values[i], case_data (c, va->vars[i]),
- var_get_width (va->vars[i]));
+ 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 < nest->n; i++)
+ {
+ if (i != nest->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, nest->vars[i]),
+ var_get_width (nest->vars[i]));
+ }
}
- f->summaries = xmalloc (ss->n_summaries * sizeof *f->summaries);
- for (size_t i = 0; i < ss->n_summaries; i++)
- ctables_summary_init (&f->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->ft, &f->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,
- case_data (c, ss->summary_var), weight);
+ {
+ const struct ctables_summary_spec_set *sss
+ = (cell->total ? &ss->total_sss : &ss->cell_sss);
+ cell->summaries = xmalloc (sss->n * sizeof *cell->summaries);
+ for (size_t i = 0; i < sss->n; i++)
+ ctables_summary_init (&cell->summaries[i], &sss->summaries[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);
+
+summarize: ;
+ const struct ctables_summary_spec_set *sss
+ = (cell->total ? &ss->total_sss : &ss->cell_sss);
+ for (size_t i = 0; i < sss->n; i++)
+ ctables_summary_add (&cell->summaries[i], &sss->summaries[i], sss->var,
+ case_data (c, sss->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_axis, size_t start_nest)
+{
+ for (enum pivot_axis_type a = start_axis; a < PIVOT_N_AXES; a++)
+ {
+ const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ for (size_t i = start_nest; i < nest->n; i++)
+ {
+ if (i == nest->scale_idx)
+ continue;
+
+ const struct variable *var = nest->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_nest = 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 ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ for (size_t i = 0; i < nest->n; i++)
+ {
+ if (i == nest->scale_idx)
+ continue;
+
+ const struct variable *var = nest->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 ctables_nest *nest = &t->stacks[a].nests[ix[a]];
+ for (size_t i = 0; i < nest->n; i++)
+ {
+ 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);
+ cats[a][i] = save;
+ }
+ }
+ }
}
static bool
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++)
+ for (size_t i = 0; i < t->stacks[t->summary_axis].n; i++)
{
- struct var_array *va = &t->vaas[t->summary_axis].vas[i];
- if (!va->n_summaries)
+ struct ctables_nest *nest = &t->stacks[t->summary_axis].nests[i];
+ if (!nest->cell_sss.n)
{
- va->summaries = xmalloc (sizeof *va->summaries);
- va->n_summaries = 1;
+ struct ctables_summary_spec_set *sss = &nest->cell_sss;
+ sss->summaries = xmalloc (sizeof *sss->summaries);
+ sss->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 };
+ = sss->var ? CTSF_MEAN : CTSF_COUNT;
+ struct ctables_var var = { .is_mrset = false, .var = sss->var };
- *va->summaries = (struct ctables_summary_spec) {
+ *sss->summaries = (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 (!sss->var)
+ sss->var = nest->vars[0];
+
+ nest->total_sss = nest->cell_sss;
}
+ else if (!nest->total_sss.n)
+ nest->total_sss = nest->cell_sss;
}
}
{
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++)
- ctables_freqtab_insert (t, c, ir, ic, il, weight);
+ 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);
}
}
casereader_destroy (input);
(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));
assert (t->axes[a]);
- struct ctables_freq **sorted = xnmalloc (t->ft.count, sizeof *sorted);
+ struct ctables_cell **sorted = xnmalloc (t->cells.count, sizeof *sorted);
- struct ctables_freq *f;
+ struct ctables_cell *cell;
size_t n = 0;
- HMAP_FOR_EACH (f, struct ctables_freq, node, &t->ft)
- sorted[n++] = f;
- assert (n == t->ft.count);
+ HMAP_FOR_EACH (cell, struct ctables_cell, node, &t->cells)
+ if (!cell->hide)
+ sorted[n++] = cell;
+ assert (n <= t->cells.count);
- struct ctables_freq_sort_aux aux = { .t = t, .a = a };
- sort (sorted, n, sizeof *sorted, ctables_freq_compare_3way, &aux);
+ struct ctables_cell_sort_aux aux = { .t = t, .a = a };
+ 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;
int prev_leaf = 0;
for (size_t j = 0; j < n; j++)
{
- struct ctables_freq *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 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_freq *prev = sorted[j - 1];
- if (prev->axes[a].vaa_idx == f->axes[a].vaa_idx)
+ struct ctables_cell *prev = sorted[j - 1];
+ if (prev->axes[a].stack_idx == cell->axes[a].stack_idx)
{
- for (; n_common < va->n; n_common++)
- if (n_common != va->scale_idx
- && !value_equal (&prev->axes[a].values[n_common],
- &f->axes[a].values[n_common],
- var_get_type (va->vars[n_common])))
+ 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 (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)
{
- f->axes[a].leaf = prev_leaf;
+ 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
- ? pivot_value_new_var_value (va->vars[k],
- &f->axes[a].values[k])
- : NULL);
- if (k == va->n - 1)
+ = (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 (nest->vars[k],
+ &cell->axes[a].cvs[k].value));
+ 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 *sss
+ = cell->total ? &nest->total_sss : &nest->cell_sss;
+ for (size_t m = 0; m < sss->n; m++)
{
int leaf = pivot_category_create_leaf (
- parent, pivot_value_new_text (va->summaries[m].label));
+ parent, pivot_value_new_text (sss->summaries[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;
}
- f->axes[a].leaf = prev_leaf;
+ cell->axes[a].leaf = prev_leaf;
}
free (sorted);
free (groups);
}
- struct ctables_freq *f;
- HMAP_FOR_EACH (f, struct ctables_freq, node, &t->ft)
+ 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];
- for (size_t j = 0; j < ss->n_summaries; j++)
+ if (cell->hide)
+ continue;
+
+ const struct ctables_nest *nest = &t->stacks[t->summary_axis].nests[cell->axes[t->summary_axis].stack_idx];
+ const struct ctables_summary_spec_set *sss = cell->total ? &nest->total_sss : &nest->cell_sss;
+ for (size_t j = 0; j < sss->n; j++)
{
size_t dindexes[3];
size_t n_dindexes = 0;
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], &sss->summaries[j]);
struct pivot_value *value = pivot_value_new_number (d);
- value->numeric.format = ss->summaries[j].format;
+ value->numeric.format = sss->summaries[j].format;
pivot_table_put (pt, dindexes, n_dindexes, value);
}
}
pivot_table_submit (pt);
}
-#if 0
- for (size_t i = 0; i < ct->n_tables; i++)
- {
- struct ctables_table *t = ct->tables[i];
-
- for (size_t j = 0; j < t->n_fts; j++)
- {
- struct ctables_freqtab *ft = t->fts[j];
- struct ctables_freq *f, *next;
- HMAP_FOR_EACH_SAFE (f, next, struct ctables_freq, node, &ft->data)
- {
- hmap_delete (&ft->data, &f->node);
- for (size_t k = 0; k < ft->n_summaries; k++)
- ctables_summary_uninit (&f->summaries[k], &ft->summaries[k]);
- free (f->summaries);
- for (size_t k = 0; k < ft->vars.n; k++)
- {
- const struct variable *var = ft->vars.vars[k];
- value_destroy (&f->values[k], var_get_width (var));
- }
- free (f);
- }
- hmap_destroy (&ft->data);
- var_array_uninit (&ft->vars);
- free (ft);
- }
- free (t->fts);
- }
-#endif
-
return proc_commit (ds);
}
ct->tables = x2nrealloc (ct->tables, &allocated_tables,
sizeof *ct->tables);
+ struct ctables_category *cat = xmalloc (sizeof *cat);
+ *cat = (struct ctables_category) {
+ .type = CCT_VALUE,
+ .include_missing = false,
+ .sort_ascending = true,
+ };
+
+ struct ctables_categories *c = xmalloc (sizeof *c);
+ size_t n_vars = dict_get_n_vars (dataset_dict (ds));
+ *c = (struct ctables_categories) {
+ .n_refs = n_vars,
+ .cats = cat,
+ .n_cats = 1,
+ };
+
+ struct ctables_categories **categories = xnmalloc (n_vars,
+ sizeof *categories);
+ for (size_t i = 0; i < n_vars; i++)
+ categories[i] = c;
+
struct ctables_table *t = xmalloc (sizeof *t);
*t = (struct ctables_table) {
- .ft = HMAP_INITIALIZER (t->ft),
+ .cells = HMAP_INITIALIZER (t->cells),
.slabels_position = PIVOT_AXIS_COLUMN,
.slabels_visible = true,
.row_labels = CTLP_NORMAL,
.col_labels = CTLP_NORMAL,
- .categories = xcalloc (dict_get_n_vars (dataset_dict (ds)),
- sizeof *t->categories),
- .n_categories = dict_get_n_vars (dataset_dict (ds)),
+ .categories = categories,
+ .n_categories = n_vars,
.cilevel = 95,
};
for (enum ctables_domain_type dt = 0; dt < N_CTDTS; dt++)
"SIGTEST", "COMPARETEST");
goto error;
}
+
+ if (!lex_match (lexer, T_SLASH))
+ break;
}
if (t->row_labels != CTLP_NORMAL && t->col_labels != CTLP_NORMAL)
projects / pspp / blobdiff