refactor

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

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 836a974d824dda2f6f00c7cffa96df4e4b97c559..57e547376ac639da1e1aec5a8a70802e12789d8d 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -455,6 +455,7 @@ struct ctables_table
     */
     enum pivot_axis_type label_axis[PIVOT_N_AXES];
     enum pivot_axis_type clabels_from_axis;
+    enum pivot_axis_type clabels_to_axis;
     const struct variable *clabels_example;
     struct hmap clabels_values_map;
     struct ctables_value **clabels_values;
@@ -4497,8 +4498,6 @@ ctables_check_label_position (struct ctables_table *t, enum pivot_axis_type a)
   if (label_pos == a)
     return true;
 
-  t->clabels_from_axis = a;
-
   const char *subcommand_name = a == PIVOT_AXIS_ROW ? "ROWLABELS" : "COLLABELS";
   const char *pos_name = label_pos == PIVOT_AXIS_LAYER ? "LAYER" : "OPPOSITE";
 
@@ -4678,7 +4677,9 @@ ctables_prepare_table (struct ctables_table *t)
                         continue;
                       nest->areas[at][nest->n_areas[at]++] = k;
                     }
-                else if ((at == CTAT_COL || at == CTAT_LAYERCOL) && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                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--)
                       {
@@ -4687,19 +4688,93 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->areas[at][nest->n_areas[at]++] = k;
                         break;
                       }
+                    continue;
+                  }
+
+                size_t n_drop = 0;
+                bool drop_inner = false;
+                switch (at)
+                  {
+                  case CTAT_SUBTABLE:
+                    if (t->clabels_from_axis == PIVOT_AXIS_LAYER)
+                      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
+                      {
+                        drop_inner = a == t->clabels_from_axis;
+                        n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
+                      }
+                    break;
+
+                  case CTAT_LAYERROW:
+                    n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
+                    break;
+
+                  case CTAT_LAYERCOL:
+                    n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
+                    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
+                      {
+                        n_drop = a == PIVOT_AXIS_ROW;
+                        if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                          n_drop++;
+                      }
+                    break;
+
+                  case CTAT_LAYER:
+                  case CTAT_TABLE:
+                    n_drop = 0;
+                    break;
                   }
 
-                bool drop_last = (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
-                                  : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
-                                  : at == CTAT_COL ? a == PIVOT_AXIS_ROW
-                                  : false);
-                if (drop_last && nest->n_areas[at] > 0)
-                  nest->n_areas[at]--;
-
-                bool drop_additional
-                  = (((at == CTAT_ROW || at == CTAT_LAYERROW || at == CTAT_COL) && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN));
-                if (drop_additional && nest->n_areas[at] > 0)
-                  nest->n_areas[at]--;
+                if (drop_inner)
+                  {
+                    size_t n = nest->n_areas[at];
+                    if (n > 1)
+                      {
+                        nest->areas[at][n - 2] = nest->areas[at][n - 1];
+                        nest->n_areas[at]--;
+                      }
+                  }
+                for (size_t i = 0; i < n_drop; i++)
+                  if (nest->n_areas[at] > 0)
+                    nest->n_areas[at]--;
               }
           }
       }
@@ -6221,6 +6296,7 @@ cmd_ctables (struct lexer *lexer, struct dataset *ds)
           [PIVOT_AXIS_LAYER] = PIVOT_AXIS_LAYER,
         },
         .clabels_from_axis = PIVOT_AXIS_LAYER,
+        .clabels_to_axis = PIVOT_AXIS_LAYER,
         .categories = categories,
         .n_categories = n_vars,
         .cilevel = 95,
@@ -6659,12 +6735,18 @@ cmd_ctables (struct lexer *lexer, struct dataset *ds)
             break;
         }
 
-      if (t->label_axis[PIVOT_AXIS_ROW] != PIVOT_AXIS_ROW
-          && t->label_axis[PIVOT_AXIS_COLUMN] != PIVOT_AXIS_COLUMN)
+      if (t->label_axis[PIVOT_AXIS_ROW] != PIVOT_AXIS_ROW)
         {
-          msg (SE, _("ROWLABELS and COLLABELS may not both be specified."));
-          goto error;
+          t->clabels_from_axis = PIVOT_AXIS_ROW;
+          if (t->label_axis[PIVOT_AXIS_COLUMN] != PIVOT_AXIS_COLUMN)
+            {
+              msg (SE, _("ROWLABELS and COLLABELS may not both be specified."));
+              goto error;
+            }
         }
+      else if (t->label_axis[PIVOT_AXIS_COLUMN] != PIVOT_AXIS_COLUMN)
+        t->clabels_from_axis = PIVOT_AXIS_COLUMN;
+      t->clabels_to_axis = t->label_axis[t->clabels_from_axis];
 
       if (!ctables_prepare_table (t))
         goto error;