break;
case CTSF_MEAN:
+ case CTSF_SUM:
+ case CTSF_areaPCT_SUM:
+ s->moments = moments1_create (MOMENT_MEAN);
+ break;
+
case CTSF_SEMEAN:
case CTSF_STDDEV:
- case CTSF_SUM:
case CTSF_VARIANCE:
- case CTSF_areaPCT_SUM:
s->moments = moments1_create (MOMENT_VARIANCE);
break;
switch (ss->function)
{
case CTSF_TOTALN:
- case CTSF_areaPCT_TOTALN:
s->count += ss->weighted ? d_weight : 1.0;
break;
+ case CTSF_areaPCT_TOTALN:
+ s->count += ss->weighted ? e_weight : 1.0;
+ break;
+
case CTSF_COUNT:
- case CTSF_areaPCT_COUNT:
if (is_scale || !excluded_missing)
s->count += ss->weighted ? d_weight : 1.0;
break;
+ case CTSF_areaPCT_COUNT:
+ if (is_scale || !excluded_missing)
+ s->count += ss->weighted ? e_weight : 1.0;
+ break;
+
case CTSF_VALIDN:
- case CTSF_areaPCT_VALIDN:
if (is_scale
? !is_scale_missing
: !is_missing)
s->count += ss->weighted ? d_weight : 1.0;
break;
+ case CTSF_areaPCT_VALIDN:
+ if (is_scale
+ ? !is_scale_missing
+ : !is_missing)
+ s->count += ss->weighted ? e_weight : 1.0;
+ break;
+
case CTSF_areaID:
break;
if (is_scale
? is_scale_missing
: is_missing)
- s->count += ss->weighted ? d_weight : 1.0;
+ s->count += ss->weighted ? e_weight : 1.0;
break;
case CTSF_ECOUNT:
case CTSF_STDDEV:
case CTSF_SUM:
case CTSF_VARIANCE:
- case CTSF_areaPCT_SUM:
if (!is_scale_missing)
moments1_add (s->moments, value->f, ss->weighted ? e_weight : 1.0);
break;
+ case CTSF_areaPCT_SUM:
+ if (!is_missing && !is_scale_missing)
+ moments1_add (s->moments, value->f, ss->weighted ? e_weight : 1.0);
+ break;
+
case CTSF_MEDIAN:
case CTSF_MODE:
case CTSF_PTILE:
for (size_t i = 0; i < nest->n; i++)
hmap_init (&s->occurrences[a][i]);
}
- for (size_t i = 0; i < N_CTATS; i++)
- hmap_init (&s->areas[i]);
+ for (enum ctables_area_type at = 0; at < N_CTATS; at++)
+ hmap_init (&s->areas[at]);
}
}
switch (at)
{
case CTAT_SUBTABLE:
- if (t->clabels_from_axis == PIVOT_AXIS_LAYER)
- n_drop = a != PIVOT_AXIS_LAYER;
- else if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
- n_drop = a == t->clabels_from_axis ? 2 : 0;
- else if (a == t->clabels_from_axis)
- n_drop = -1;
- else
- n_drop = a != PIVOT_AXIS_LAYER;
+#define L PIVOT_AXIS_LAYER
+ n_drop = (t->clabels_from_axis == L ? a != L
+ : t->clabels_to_axis == L ? (t->clabels_from_axis == a ? -1 : a != L)
+ : t->clabels_from_axis == a ? 2
+ : 0);
+#undef L
break;
case CTAT_LAYERROW:
case CTAT_ROW:
case CTAT_COL:
- if (a == ata)
- n_drop = t->label_axis[ata] == atb;
- else if (a != atb)
- n_drop = 0;
- else if (t->clabels_from_axis == atb)
- n_drop = -1;
- else if (t->clabels_to_axis != atb)
- n_drop = 1;
- else
- n_drop = 0;
+ n_drop = (a == ata ? t->label_axis[ata] == atb
+ : a != atb ? 0
+ : t->clabels_from_axis == atb ? -1
+ : t->clabels_to_axis != atb ? 1
+ : 0);
break;
case CTAT_LAYER:
}
hmap_destroy (&s->cells);
- for (size_t i = 0; i < N_CTATS; i++)
- hmap_destroy (&s->areas[i]);
+ for (enum ctables_area_type at = 0; at < N_CTATS; at++)
+ hmap_destroy (&s->areas[at]);
}
static void
for (struct ccase *c = casereader_read (group); c;
case_unref (c), c = casereader_read (group))
{
- double d_weight = dict_get_case_weight (dict, c, &warn_on_invalid);
+ double d_weight = dict_get_rounded_case_weight (dict, c, &warn_on_invalid);
double e_weight = (ct->e_weight
? var_force_valid_weight (ct->e_weight,
case_num (c, ct->e_weight),