continue;
}
+ enum pivot_axis_type ata, atb;
+ if (at == CTAT_ROW || at == CTAT_LAYERROW)
+ {
+ ata = PIVOT_AXIS_ROW;
+ atb = PIVOT_AXIS_COLUMN;
+ }
+ else if (at == CTAT_COL || at == CTAT_LAYERCOL)
+ {
+ ata = PIVOT_AXIS_COLUMN;
+ atb = PIVOT_AXIS_ROW;
+ }
+
size_t n_drop = 0;
bool drop_inner = false;
switch (at)
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)
+ drop_inner = true;
else
- {
- drop_inner = a == t->clabels_from_axis;
- n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
- }
+ n_drop = a != PIVOT_AXIS_LAYER;
break;
case CTAT_LAYERROW:
- n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
- break;
-
case CTAT_LAYERCOL:
- n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
+ n_drop = a == ata && t->label_axis[ata] == atb;
break;
case CTAT_ROW:
- if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
- n_drop = 0;
- else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
- {
- drop_inner = true;
- n_drop = 0;
- }
- else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
- {
- drop_inner = true;
- n_drop = 0;
- }
- else
- {
- n_drop = a == PIVOT_AXIS_COLUMN;
- if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
- n_drop++;
- }
- break;
-
case CTAT_COL:
- if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
- {
- drop_inner = true;
- n_drop = 0;
- }
- else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
- n_drop = 0;
- else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
- {
- drop_inner = true;
- n_drop = 0;
- }
- else
+ if (a == atb)
{
- n_drop = a == PIVOT_AXIS_ROW;
- if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
- n_drop++;
+ if (t->clabels_from_axis == atb)
+ drop_inner = true;
+ else if (t->clabels_to_axis != atb)
+ n_drop = 1;
}
+ else if (a == ata)
+ n_drop = t->label_axis[ata] == atb;
break;
case CTAT_LAYER:
case CTAT_TABLE:
- n_drop = 0;
break;
}