refactor

[pspp] / src / language / stats / ctables.c

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 8f8d6c885f4d0ee5b3991d3d0a2833abc175ba16..2490efde10e9803917180b2f4981061161112c6d 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4712,11 +4712,10 @@ ctables_prepare_table (struct ctables_table *t)
                       n_drop = a != PIVOT_AXIS_LAYER;
                     else if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
                       n_drop = a == t->clabels_from_axis ? 2 : 0;
+                    else if (a == t->clabels_from_axis)
+                      drop_inner = true;
                     else
-                      {
-                        n_drop = a != PIVOT_AXIS_LAYER && a != t->clabels_from_axis;
-                        drop_inner = a == t->clabels_from_axis;
-                      }
+                      n_drop = a != PIVOT_AXIS_LAYER;
                     break;
 
                   case CTAT_LAYERROW:
@@ -4725,50 +4724,20 @@ ctables_prepare_table (struct ctables_table *t)
                     break;
 
                   case CTAT_ROW:
-                    if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                      n_drop = 0;
-                    else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else
-                      {
-                        n_drop = a == PIVOT_AXIS_COLUMN;
-                        if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                          n_drop++;
-                      }
-                    break;
-
                   case CTAT_COL:
-                    if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                      n_drop = 0;
-                    else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
-                      {
-                        drop_inner = true;
-                        n_drop = 0;
-                      }
-                    else
+                    if (a == atb)
                       {
-                        n_drop = a == PIVOT_AXIS_ROW;
-                        if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                          n_drop++;
+                        if (t->clabels_from_axis == atb)
+                          drop_inner = true;
+                        else if (t->clabels_to_axis != atb)
+                          n_drop = 1;
                       }
+                    else if (a == ata)
+                      n_drop = t->label_axis[ata] == atb;
                     break;
 
                   case CTAT_LAYER:
                   case CTAT_TABLE:
-                    n_drop = 0;
                     break;
                   }