From 588d9107cd4b6eee3a0c3ece3cf53868e22c52f4 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 13 Aug 2022 23:29:44 -0700 Subject: [PATCH] refactor --- src/language/stats/ctables.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index c3c797a52c..e78c0cf169 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -4702,7 +4702,7 @@ ctables_prepare_table (struct ctables_table *t) if (k != nest->scale_idx) nest->areas[at][nest->n_areas[at]++] = k; - int n_drop = 0; + int n_drop; switch (at) { case CTAT_SUBTABLE: @@ -4723,19 +4723,21 @@ ctables_prepare_table (struct ctables_table *t) case CTAT_ROW: case CTAT_COL: - if (a == atb) - { - if (t->clabels_from_axis == atb) - n_drop = -1; - else if (t->clabels_to_axis != atb) - n_drop = 1; - } - else if (a == ata) + if (a == ata) n_drop = t->label_axis[ata] == atb; + else if (a != atb) + n_drop = 0; + else if (t->clabels_from_axis == atb) + n_drop = -1; + else if (t->clabels_to_axis != atb) + n_drop = 1; + else + n_drop = 0; break; case CTAT_LAYER: case CTAT_TABLE: + n_drop = 0; break; } -- 2.30.2