From 033449d465fb54526d3984d55772e6a38e7d922c Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 13 Aug 2022 21:50:42 -0700 Subject: [PATCH] refactoring --- src/language/stats/ctables.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index fac05a9bc2..20f18916c8 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -4678,29 +4678,9 @@ ctables_prepare_table (struct ctables_table *t) continue; nest->areas[at][nest->n_areas[at]++] = k; } - 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--) - { - if (k == nest->scale_idx) - continue; - nest->areas[at][nest->n_areas[at]++] = k; - break; - } - continue; - } - 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--) - { - if (k == nest->scale_idx) - continue; - nest->areas[at][nest->n_areas[at]++] = k; - break; - } - continue; - } - else if (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER) + else if ((at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[a] != a) + || (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a) + || (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER)) { for (size_t k = nest->n - 1; k < nest->n; k--) { -- 2.30.2