From ea34fc3d157ce3038ea8cfe8c5e0ca21944762a7 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 13 Aug 2022 22:44:25 -0700 Subject: [PATCH] refactor --- src/language/stats/ctables.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index cd963e785f..6d3f44d327 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -4732,18 +4732,24 @@ ctables_prepare_table (struct ctables_table *t) n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN; else if (at == CTAT_LAYERCOL) n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW; - else + else if (at == CTAT_SUBTABLE) + n_drop = a != PIVOT_AXIS_LAYER; + else if (at == CTAT_ROW) { - n_drop = 0; - if (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER - : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN - : at == CTAT_COL ? a == PIVOT_AXIS_ROW - : false) + n_drop = a == PIVOT_AXIS_COLUMN; + if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN) n_drop++; - if ((at == CTAT_ROW && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN) - || (at == CTAT_COL && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)) + } + else if (at == CTAT_COL) + { + n_drop = a == PIVOT_AXIS_ROW; + if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW) n_drop++; } + else + { + n_drop = 0; + } if (drop_inner) { -- 2.30.2