From dfb0db0d34a420f994125c3f2702dfec6119f845 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 13 Aug 2022 22:19:55 -0700 Subject: [PATCH] refactoring --- src/language/stats/ctables.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index 7f5ac97f8b..fa43892176 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -4697,25 +4697,17 @@ ctables_prepare_table (struct ctables_table *t) && t->clabels_from_axis != PIVOT_AXIS_LAYER && t->clabels_to_axis != PIVOT_AXIS_LAYER) n_drop = a == t->clabels_from_axis ? 2 : 0; - else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER) + else if (at == CTAT_SUBTABLE + && t->clabels_from_axis != PIVOT_AXIS_LAYER + && t->clabels_to_axis == PIVOT_AXIS_LAYER) { - if (a == PIVOT_AXIS_COLUMN) + if (a == PIVOT_AXIS_LAYER) + n_drop = 0; + else if (a != t->clabels_from_axis) n_drop = 1; else { - if (a == PIVOT_AXIS_ROW) - drop_inner = true; - n_drop = 0; - } - } - else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER) - { - if (a == PIVOT_AXIS_ROW) - n_drop = 1; - else - { - if (a == PIVOT_AXIS_COLUMN) - drop_inner = true; + drop_inner = true; n_drop = 0; } } -- 2.30.2