#undef S
};
+struct ctables_subtable
+ {
+ /* In struct ctables's 'subtables' hmap. Indexed by all the values in all
+ the axes except the innermost row and column variable and the scalar
+ variable, if any. (If the scalar variable is the innermost row or
+ column variable, then the second-to-innermost variable is also omitted
+ along that axis.) */
+ struct hmap_node node;
+
+ const struct ctables_freq *example;
+
+ double valid;
+ double missing;
+ };
+
+struct ctables_layer
+ {
+ /* In struct ctables's 'layers' hmap. Indexed by all the values in the
+ layer axis, except the scalar variable, if any. */
+ struct hmap_node node;
+
+ double valid;
+ double missing;
+ };
+
+struct ctables_freq
+ {
+ /* In struct ctables's 'ft' hmap. Indexed by all the values in all the
+ axes (except the scalar variable, if any). */
+ struct hmap_node node;
+
+ /* The subtable that contains this cell. */
+ struct ctables_subtable *subtable;
+
+ /* The layer that contains this cell. */
+
+ struct
+ {
+ size_t vaa_idx;
+ union value *values;
+ int leaf;
+ }
+ axes[PIVOT_N_AXES];
+
+ union ctables_summary *summaries;
+ };
+
struct ctables
{
struct pivot_table_look *look;
{
struct variable **vars;
size_t n;
+ size_t scale_idx;
+ size_t subtable_idx;
struct ctables_summary_spec *summaries;
size_t n_summaries;
struct var_array2 vaas[PIVOT_N_AXES];
enum pivot_axis_type summary_axis;
struct hmap ft;
+ struct hmap subtables;
enum pivot_axis_type slabels_position;
bool slabels_visible;
NOT_REACHED ();
vaa.vas[vaa.n++] = (struct var_array) {
.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,
{
case CTAO_VAR:
assert (!a->var.is_mrset);
+
+ struct variable **vars = xmalloc (sizeof *vars);
+ *vars = a->var.var;
+
struct var_array *va = xmalloc (sizeof *va);
- if (a->scale)
- *va = (struct var_array) { .n = 0 };
- else
- {
- struct variable **vars = xmalloc (sizeof *vars);
- *vars = a->var.var;
- enum pivot_axis_type *axes = xmalloc (sizeof *axes);
- *axes = axis_type;
- *va = (struct var_array) { .vars = vars, .n = 1 };
- }
+ *va = (struct var_array) {
+ .vars = vars,
+ .n = 1,
+ .scale_idx = a->scale ? 0 : SIZE_MAX,
+ };
if (a->n_summaries || a->scale)
{
va->summaries = a->summaries;
/* XXX percentiles, median, mode, multiple response */
};
-#if 0
static void
ctables_summary_init (union ctables_summary *s,
const struct ctables_summary_spec *ss)
}
}
-static void
+static void UNUSED
ctables_summary_uninit (union ctables_summary *s,
const struct ctables_summary_spec *ss)
{
}
static double
-ctables_summary_value (union ctables_summary *s,
+ctables_summary_value (const struct ctables_freq *f,
+ union ctables_summary *s,
const struct ctables_summary_spec *ss)
{
switch (ss->function)
case CTSF_ECOUNT:
return s->valid;
+ case CTSF_SUBTABLEPCT_COUNT:
+ return f->subtable->valid ? s->valid / f->subtable->valid * 100 : SYSMIS;
+
case CTSF_ROWPCT_COUNT:
case CTSF_COLPCT_COUNT:
case CTSF_TABLEPCT_COUNT:
- case CTSF_SUBTABLEPCT_COUNT:
case CTSF_LAYERPCT_COUNT:
case CTSF_LAYERROWPCT_COUNT:
case CTSF_LAYERCOLPCT_COUNT:
NOT_REACHED ();
}
-#endif
-
-struct ctables_freq
- {
- struct hmap_node node; /* Element in hash table. */
-
- struct
- {
- size_t vaa_idx;
- union value *values;
- }
- axes[PIVOT_N_AXES];
-
- //union ctables_summary *summaries;
- double count;
- };
-
-#if 0
-static struct ctables_freq *
-ctables_freq_create (struct ctables_freqtab *ft)
-{
- struct ctables_freq *f = xmalloc (sizeof *f + ft->vars.n * sizeof *f->values);
- f->summaries = xmalloc (ft->n_summaries * sizeof *f->summaries);
- for (size_t i = 0; i < ft->n_summaries; i++)
- ctables_summary_init (&f->summaries[i], &ft->summaries[i]);
- return f;
-}
-
-static void
-ctables_freq_add (struct ctables_freqtab *ft, struct ctables_freq *f,
- const struct variable *var, const union value *value,
- double weight)
-{
- for (size_t i = 0; i < ft->n_summaries; i++)
- ctables_summary_add (&f->summaries[i], &ft->summaries[i],
- var, value, weight);
-}
-#endif
struct ctables_freq_sort_aux
{
const struct var_array *va = &aux->t->vaas[aux->a].vas[a_idx];
for (size_t i = 0; i < va->n; i++)
- {
- int cmp = value_compare_3way (&a->axes[aux->a].values[i],
- &b->axes[aux->a].values[i],
- var_get_width (va->vars[i]));
- if (cmp)
- return cmp;
- }
+ if (i != va->scale_idx)
+ {
+ int cmp = value_compare_3way (&a->axes[aux->a].values[i],
+ &b->axes[aux->a].values[i],
+ var_get_width (va->vars[i]));
+ if (cmp)
+ return cmp;
+ }
return 0;
}
Fill the table entry using the indexes from before.
*/
+static struct ctables_subtable *
+ctables_subtable_insert (struct ctables_table *t, struct ctables_freq *f)
+{
+ 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];
+ hash = hash_int (idx, hash);
+ for (size_t i = 0; i < va->n; i++)
+ if (i != va->scale_idx && i != va->subtable_idx)
+ hash = value_hash (&f->axes[a].values[i],
+ var_get_width (va->vars[i]), hash);
+ }
+
+ struct ctables_subtable *st;
+ HMAP_FOR_EACH_WITH_HASH (st, struct ctables_subtable, node, hash, &t->subtables)
+ {
+ const struct ctables_freq *stf = st->example;
+ for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
+ {
+ size_t idx = f->axes[a].vaa_idx;
+ if (idx != stf->axes[a].vaa_idx)
+ goto not_equal;
+
+ const struct var_array *va = &t->vaas[a].vas[idx];
+ for (size_t i = 0; i < va->n; i++)
+ if (i != va->scale_idx && i != va->subtable_idx
+ && !value_equal (&stf->axes[a].values[i],
+ &f->axes[a].values[i],
+ var_get_width (va->vars[i])))
+ goto not_equal;
+ }
+
+ return st;
+
+ not_equal: ;
+ }
+
+ st = xmalloc (sizeof *st);
+ *st = (struct ctables_subtable) { .example = f };
+ hmap_insert (&t->subtables, &st->node, hash);
+ return st;
+}
+
static void
ctables_freqtab_insert (struct ctables_table *t,
const struct ccase *c,
[PIVOT_AXIS_COLUMN] = ic,
[PIVOT_AXIS_LAYER] = il,
};
+ const struct var_array *ss = &t->vaas[t->summary_axis].vas[ix[t->summary_axis]];
size_t hash = 0;
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
const struct var_array *va = &t->vaas[a].vas[ix[a]];
hash = hash_int (ix[a], hash);
for (size_t i = 0; i < va->n; i++)
- hash = value_hash (case_data (c, va->vars[i]),
- var_get_width (va->vars[i]), hash);
+ if (i != va->scale_idx)
+ hash = value_hash (case_data (c, va->vars[i]),
+ var_get_width (va->vars[i]), hash);
}
struct ctables_freq *f;
if (f->axes[a].vaa_idx != ix[a])
goto not_equal;
for (size_t i = 0; i < va->n; i++)
- if (!value_equal (case_data (c, va->vars[i]),
- &f->axes[a].values[i],
- var_get_width (va->vars[i])))
- goto not_equal;
+ if (i != va->scale_idx
+ && !value_equal (case_data (c, va->vars[i]),
+ &f->axes[a].values[i],
+ var_get_width (va->vars[i])))
+ goto not_equal;
}
- f->count += weight;
- return;
+ goto summarize;
not_equal: ;
}
value_clone (&f->axes[a].values[i], case_data (c, va->vars[i]),
var_get_width (va->vars[i]));
}
- f->count = weight;
+ 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]);
+ f->subtable = ctables_subtable_insert (t, f);
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);
+ f->subtable->valid += weight;
}
static bool
struct ctables_table *t = ct->tables[i];
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->vaas[a] = enumerate_fts (a, t->axes[a]);
+ for (size_t j = 0; j < t->vaas[a].n; j++)
+ {
+ struct var_array *va = &t->vaas[a].vas[j];
+ va->subtable_idx = (
+ a == PIVOT_AXIS_LAYER ? SIZE_MAX
+ : va->n == 0 ? SIZE_MAX
+ : va->scale_idx != va->n - 1 ? va->n - 1
+ : va->n == 1 ? SIZE_MAX
+ : va->n - 2);
+ }
+ }
else
{
struct var_array *va = xmalloc (sizeof *va);
dataset_dict (ds),
NULL, NULL);
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;
for (size_t i = 0; i < ct->n_tables; i++)
{
{
struct ctables_table *t = ct->tables[i];
- struct pivot_table *pt = pivot_table_create (N_("Custom Tables"));
+ struct pivot_table *pt = pivot_table_create__ (
+ (t->title
+ ? pivot_value_new_user_text (t->title, SIZE_MAX)
+ : pivot_value_new_text (N_("Custom Tables"))),
+ NULL);
+ if (t->caption)
+ pivot_table_set_caption (
+ pt, pivot_value_new_user_text (t->caption, SIZE_MAX));
+ if (t->corner)
+ pivot_table_set_caption (
+ pt, pivot_value_new_user_text (t->corner, SIZE_MAX));
+
pivot_table_set_look (pt, ct->look);
struct pivot_dimension *d[PIVOT_N_AXES];
for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
[PIVOT_AXIS_COLUMN] = N_("Columns"),
[PIVOT_AXIS_LAYER] = N_("Layers"),
};
- d[a] = (t->axes[a]
+ d[a] = (t->axes[a] || a == t->summary_axis
? pivot_dimension_create (pt, a, names[a])
: NULL);
if (!d[a])
continue;
+ assert (t->axes[a]);
+
struct ctables_freq **sorted = xnmalloc (t->ft.count, sizeof *sorted);
struct ctables_freq *f;
assert (n == t->ft.count);
struct ctables_freq_sort_aux aux = { .t = t, .a = a };
- n = sort_unique (sorted, n, sizeof *sorted, ctables_freq_compare_3way, &aux);
+ sort (sorted, n, sizeof *sorted, ctables_freq_compare_3way, &aux);
size_t max_depth = 0;
for (size_t j = 0; j < t->vaas[a].n; j++)
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];
if (prev->axes[a].vaa_idx == f->axes[a].vaa_idx)
{
for (; n_common < va->n; n_common++)
- if (!value_equal (&prev->axes[a].values[n_common],
- &f->axes[a].values[n_common],
- var_get_type (va->vars[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])))
break;
}
else
}
else
new_subtable = true;
+
if (new_subtable)
- top = pivot_category_create_group__ (
- d[a]->root, pivot_value_new_variable (va->vars[0]));
- printf ("n_common=%zu\n", n_common);
+ {
+ enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (va->vars[0])];
+ top = d[a]->root;
+ if (vlabel != CTVL_NONE)
+ top = pivot_category_create_group__ (
+ top, pivot_value_new_variable (va->vars[0]));
+ }
+ if (n_common == va->n)
+ {
+ f->axes[a].leaf = prev_leaf;
+ continue;
+ }
for (size_t k = n_common; k < va->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)
{
- pivot_category_create_leaf (
- parent,
- pivot_value_new_var_value (va->vars[va->n - 1],
- &f->axes[a].values[va->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++)
+ {
+ int leaf = pivot_category_create_leaf (
+ parent, pivot_value_new_text (va->summaries[m].label));
+ if (m == 0)
+ prev_leaf = leaf;
+ }
+ }
+ else
+ {
+ /* This assertion is true as long as the summary axis
+ is the axis where the summaries are displayed. */
+ assert (label);
+
+ prev_leaf = pivot_category_create_leaf (parent, label);
+ }
break;
}
- parent = pivot_category_create_group__ (
- parent,
- pivot_value_new_var_value (va->vars[k], &f->axes[a].values[k]));
+ if (label)
+ parent = pivot_category_create_group__ (parent, label);
- parent = pivot_category_create_group__ (
- parent, pivot_value_new_variable (va->vars[k]));
+ enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (va->vars[k + 1])];
+ if (vlabel != CTVL_NONE)
+ parent = pivot_category_create_group__ (
+ parent, pivot_value_new_variable (va->vars[k + 1]));
groups[k] = parent;
-
-#if 0
- for (size_t p = 0; p < ft->n_summaries; p++)
- {
- if (a == t->slabels_position)
- pivot_category_create_leaf (
- c, pivot_value_new_text (ft->summaries[p].label));
- //pivot_table_put1 (pt, leaf, pivot_value_new_number (value));
- }
-#endif
- }
}
+
+ f->axes[a].leaf = prev_leaf;
+ }
+ free (sorted);
free (groups);
}
+ struct ctables_freq *f;
+ HMAP_FOR_EACH (f, struct ctables_freq, node, &t->ft)
+ {
+ 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++)
+ {
+ 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;
+ if (a == t->summary_axis)
+ leaf += j;
+ dindexes[n_dindexes++] = leaf;
+ }
+
+ double d = ctables_summary_value (f, &f->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);
+ }
+ }
+
pivot_table_submit (pt);
}
struct ctables_table *t = xmalloc (sizeof *t);
*t = (struct ctables_table) {
.ft = HMAP_INITIALIZER (t->ft),
+ .subtables = HMAP_INITIALIZER (t->subtables),
.slabels_position = PIVOT_AXIS_COLUMN,
.slabels_visible = true,
.row_labels = CTLP_NORMAL,
projects / pspp / blobdiff