case CTSF_LAYERPCT_SUM:
case CTSF_LAYERROWPCT_SUM:
case CTSF_LAYERCOLPCT_SUM:
- moments1_add (s->moments, value->f, weight);
+ if (!var_is_value_missing (var, value))
+ moments1_add (s->moments, value->f, weight);
break;
case CTSF_MEDIAN:
pivot_table_set_caption (
pt, pivot_value_new_user_text (t->corner, SIZE_MAX));
- bool summary_dimension = t->summary_axis != t->slabels_axis;
+ bool summary_dimension = (t->summary_axis != t->slabels_axis
+ || (!t->slabels_visible
+ && t->summary_specs.n > 1));
if (summary_dimension)
{
struct pivot_dimension *d = pivot_dimension_create (
- pt, t->slabels_axis, N_("Summaries"));
+ pt, t->slabels_axis, N_("Statistics"));
const struct ctables_summary_spec_set *specs = &t->summary_specs;
+ if (!t->slabels_visible)
+ d->hide_all_labels = true;
for (size_t i = 0; i < specs->n; i++)
pivot_category_create_leaf (
d->root, pivot_value_new_text (specs->specs[i].label));
if (new_subtable)
{
n_levels = 0;
- printf ("%s levels:", pivot_axis_type_to_string (a));
for (size_t k = 0; k < nest->n; k++)
{
enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (nest->vars[k])];
if (vlabel != CTVL_NONE)
{
- printf (" var(%s)", var_get_name (nest->vars[k]));
levels[n_levels++] = (struct ctables_level) {
.type = CTL_VAR,
.var_idx = k,
if (nest->scale_idx != k
&& (k != nest->n - 1 || t->label_axis[a] == a))
{
- printf (" category(%s)", var_get_name (nest->vars[k]));
levels[n_levels++] = (struct ctables_level) {
.type = CTL_CATEGORY,
.var_idx = k,
}
}
- if (a == t->slabels_axis && a == t->summary_axis)
+ if (!summary_dimension && a == t->slabels_axis)
{
- printf (" summary");
levels[n_levels++] = (struct ctables_level) {
.type = CTL_SUMMARY,
.var_idx = SIZE_MAX,
};
}
- printf ("\n");
}
size_t n_common = 0;
if (level->type == CTL_CATEGORY)
{
size_t var_idx = level->var_idx;
- if (prev->axes[a].cvs[var_idx].category
- != cell->axes[a].cvs[var_idx].category)
- {
- break;
- }
- else if (!value_equal (&prev->axes[a].cvs[var_idx].value,
- &cell->axes[a].cvs[var_idx].value,
- var_get_type (nest->vars[var_idx])))
- {
- break;
- }
+ const struct ctables_category *c = cell->axes[a].cvs[var_idx].category;
+ if (prev->axes[a].cvs[var_idx].category != c)
+ break;
+ else if (c->type != CCT_SUBTOTAL
+ && c->type != CCT_HSUBTOTAL
+ && c->type != CCT_TOTAL
+ && !value_equal (&prev->axes[a].cvs[var_idx].value,
+ &cell->axes[a].cvs[var_idx].value,
+ var_get_type (nest->vars[var_idx])))
+ break;
}
}
}