continue;
nest->areas[at][nest->n_areas[at]++] = k;
}
- else if (at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
- {
- for (size_t k = nest->n - 1; k < nest->n; k--)
- {
- if (k == nest->scale_idx)
- continue;
- nest->areas[at][nest->n_areas[at]++] = k;
- break;
- }
- }
- else if (at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+ else if (at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[a] != a)
{
for (size_t k = nest->n - 1; k < nest->n; k--)
{
nest->areas[at][nest->n_areas[at]++] = k;
break;
}
+ continue;
}
- else if (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+ else if (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a)
{
for (size_t k = nest->n - 1; k < nest->n; k--)
{
nest->areas[at][nest->n_areas[at]++] = k;
break;
}
+ continue;
}
else if (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER)
{
nest->n_areas[at]--;
continue;
}
+ else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+ {
+ size_t n_drop = (a == PIVOT_AXIS_LAYER ? 0
+ : a == PIVOT_AXIS_COLUMN ? 2
+ : 0);
+ for (size_t i = 0; i < n_drop; i++)
+ if (nest->n_areas[at] > 0)
+ nest->n_areas[at]--;
+ continue;
+ }
else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
{
if (a == PIVOT_AXIS_ROW)
}
continue;
}
- else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+ else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
{
- size_t n_drop = (a == PIVOT_AXIS_LAYER ? 0
- : a == PIVOT_AXIS_COLUMN ? 2
- : 0);
- for (size_t i = 0; i < n_drop; i++)
- if (nest->n_areas[at] > 0)
- nest->n_areas[at]--;
+ if (a == PIVOT_AXIS_COLUMN)
+ {
+ size_t n = nest->n_areas[at];
+ if (n > 1)
+ {
+ nest->areas[at][n - 2] = nest->areas[at][n - 1];
+ nest->n_areas[at]--;
+ }
+ }
+ else if (a == PIVOT_AXIS_ROW)
+ {
+ if (nest->n_areas[at] > 0)
+ nest->n_areas[at]--;
+ }
continue;
}
else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
}
continue;
}
+ else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+ {
+ size_t n = nest->n_areas[at];
+ if (n > 1)
+ {
+ nest->areas[at][n - 2] = nest->areas[at][n - 1];
+ nest->n_areas[at]--;
+ }
+ continue;
+ }
bool drop_last = (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
: at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN