From 2ad9fc0f13133346ba6b153bf38a2fc06bf0be51 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 13 Aug 2022 22:58:35 -0700 Subject: [PATCH] refactor --- src/language/stats/ctables.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index 5f7162fd2a..aeae6223fc 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -4726,24 +4726,19 @@ ctables_prepare_table (struct ctables_table *t) case CTAT_ROW: case CTAT_COL: - if (a == atb && t->label_axis[ata] == atb) - n_drop = 0; - else if (a == atb && t->label_axis[atb] == ata) + if (a == atb) { - drop_inner = true; - n_drop = 0; - } - else if (a == atb && t->label_axis[atb] == PIVOT_AXIS_LAYER) - { - drop_inner = true; - n_drop = 0; - } - else - { - n_drop = a == atb; - if (a == ata && t->label_axis[ata] == atb) - n_drop++; + if (t->label_axis[ata] == atb) + ; + else if (t->label_axis[atb] == ata) + drop_inner = true; + else if (t->label_axis[atb] == PIVOT_AXIS_LAYER) + drop_inner = true; + else + n_drop = 1; } + if (a == ata && t->label_axis[ata] == atb) + n_drop++; break; case CTAT_LAYER: -- 2.30.2