X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=fb8bb3a113008c182828b1612af925af08673e1a;hb=bba95a8b863616cc849a7b89ec231efff5707b97;hp=51a4a102a644ebe33005d3fd4697f00cebfbc582;hpb=376379d0986be8c02ab174cbddbd8d2d30412eb3;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 51a4a102a6..fb8bb3a113 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -193,7 +193,7 @@ struct ctables_cell
 
     struct
       {
-        size_t stack_idx;
+        size_t nest_idx;
         struct ctables_cell_value
           {
             const struct ctables_category *category;
@@ -314,6 +314,7 @@ struct ctables_value
   {
     struct hmap_node node;
     union value value;
+    int leaf;
   };
 
 struct ctables_table
@@ -2117,8 +2118,8 @@ ctables_cell_compare_3way (const void *a_, const void *b_, const void *aux_)
   const struct ctables_cell *a = *ap;
   const struct ctables_cell *b = *bp;
 
-  size_t a_idx = a->axes[aux->a].stack_idx;
-  size_t b_idx = b->axes[aux->a].stack_idx;
+  size_t a_idx = a->axes[aux->a].nest_idx;
+  size_t b_idx = b->axes[aux->a].nest_idx;
   if (a_idx != b_idx)
     return a_idx < b_idx ? -1 : 1;
 
@@ -2207,7 +2208,7 @@ ctables_domain_insert (struct ctables_table *t, struct ctables_cell *cell,
   size_t hash = 0;
   for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
     {
-      size_t idx = cell->axes[a].stack_idx;
+      size_t idx = cell->axes[a].nest_idx;
       const struct ctables_nest *nest = &t->stacks[a].nests[idx];
       hash = hash_int (idx, hash);
       for (size_t i = 0; i < nest->n_domains[domain]; i++)
@@ -2224,8 +2225,8 @@ ctables_domain_insert (struct ctables_table *t, struct ctables_cell *cell,
       const struct ctables_cell *df = d->example;
       for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
         {
-          size_t idx = cell->axes[a].stack_idx;
-          if (idx != df->axes[a].stack_idx)
+          size_t idx = cell->axes[a].nest_idx;
+          if (idx != df->axes[a].nest_idx)
             goto not_equal;
 
           const struct ctables_nest *nest = &t->stacks[a].nests[idx];
@@ -2342,7 +2343,7 @@ ctables_cell_insert__ (struct ctables_table *t, const struct ccase *c,
       for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
         {
           const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
-          if (cell->axes[a].stack_idx != ix[a])
+          if (cell->axes[a].nest_idx != ix[a])
             goto not_equal;
           for (size_t i = 0; i < nest->n; i++)
             if (i != nest->scale_idx
@@ -2367,7 +2368,7 @@ ctables_cell_insert__ (struct ctables_table *t, const struct ccase *c,
   for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
     {
       const struct ctables_nest *nest = &t->stacks[a].nests[ix[a]];
-      cell->axes[a].stack_idx = ix[a];
+      cell->axes[a].nest_idx = ix[a];
       cell->axes[a].cvs = (nest->n
                         ? xnmalloc (nest->n, sizeof *cell->axes[a].cvs)
                         : NULL);
@@ -2520,185 +2521,6 @@ merge_item_compare_3way (const struct merge_item *a, const struct merge_item *b)
   return strcmp (as->label, bs->label);
 }
 
-static void
-ctables_table_output_same_axis (struct ctables *ct, struct ctables_table *t)
-{
-  struct pivot_table *pt = pivot_table_create__ (
-    (t->title
-     ? pivot_value_new_user_text (t->title, SIZE_MAX)
-     : pivot_value_new_text (N_("Custom Tables"))),
-    "Custom Tables");
-  if (t->caption)
-    pivot_table_set_caption (
-      pt, pivot_value_new_user_text (t->caption, SIZE_MAX));
-  if (t->corner)
-    pivot_table_set_caption (
-      pt, pivot_value_new_user_text (t->corner, SIZE_MAX));
-
-  pivot_table_set_look (pt, ct->look);
-  struct pivot_dimension *d[PIVOT_N_AXES];
-  for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
-    {
-      static const char *names[] = {
-        [PIVOT_AXIS_ROW] = N_("Rows"),
-        [PIVOT_AXIS_COLUMN] = N_("Columns"),
-        [PIVOT_AXIS_LAYER] = N_("Layers"),
-      };
-      d[a] = (t->axes[a] || a == t->summary_axis
-              ? pivot_dimension_create (pt, a, names[a])
-              : NULL);
-      if (!d[a])
-        continue;
-
-      assert (t->axes[a]);
-
-      struct ctables_cell **sorted = xnmalloc (t->cells.count, sizeof *sorted);
-
-      struct ctables_cell *cell;
-      size_t n = 0;
-      HMAP_FOR_EACH (cell, struct ctables_cell, node, &t->cells)
-        if (!cell->hide)
-          sorted[n++] = cell;
-      assert (n <= t->cells.count);
-
-      struct ctables_cell_sort_aux aux = { .t = t, .a = a };
-      sort (sorted, n, sizeof *sorted, ctables_cell_compare_3way, &aux);
-
-      size_t max_depth = 0;
-      for (size_t j = 0; j < t->stacks[a].n; j++)
-        if (t->stacks[a].nests[j].n > max_depth)
-          max_depth = t->stacks[a].nests[j].n;
-
-      struct pivot_category **groups = xnmalloc (max_depth, sizeof *groups);
-      struct pivot_category *top = NULL;
-      int prev_leaf = 0;
-      for (size_t j = 0; j < n; j++)
-        {
-          struct ctables_cell *cell = sorted[j];
-          const struct ctables_nest *nest = &t->stacks[a].nests[cell->axes[a].stack_idx];
-
-          size_t n_common = 0;
-          bool new_subtable = false;
-          if (j > 0)
-            {
-              struct ctables_cell *prev = sorted[j - 1];
-              if (prev->axes[a].stack_idx == cell->axes[a].stack_idx)
-                {
-                  for (; n_common < nest->n; n_common++)
-                    if (n_common != nest->scale_idx
-                        && (prev->axes[a].cvs[n_common].category
-                            != cell->axes[a].cvs[n_common].category
-                            || !value_equal (&prev->axes[a].cvs[n_common].value,
-                                             &cell->axes[a].cvs[n_common].value,
-                                             var_get_type (nest->vars[n_common]))))
-                      break;
-                }
-              else
-                new_subtable = true;
-            }
-          else
-            new_subtable = true;
-
-          if (new_subtable)
-            {
-              enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (nest->vars[0])];
-              top = d[a]->root;
-              if (vlabel != CTVL_NONE)
-                top = pivot_category_create_group__ (
-                  top, pivot_value_new_variable (nest->vars[0]));
-            }
-          if (n_common == nest->n)
-            {
-              cell->axes[a].leaf = prev_leaf;
-              continue;
-            }
-
-          for (size_t k = n_common; k < nest->n; k++)
-            {
-              struct pivot_category *parent = k > 0 ? groups[k - 1] : top;
-
-              struct pivot_value *label
-                = (k == nest->scale_idx ? NULL
-                   : (cell->axes[a].cvs[k].category->type == CCT_TOTAL
-                      || cell->axes[a].cvs[k].category->type == CCT_SUBTOTAL
-                      || cell->axes[a].cvs[k].category->type == CCT_HSUBTOTAL)
-                   ? pivot_value_new_user_text (cell->axes[a].cvs[k].category->total_label,
-                                                SIZE_MAX)
-                   : pivot_value_new_var_value (nest->vars[k],
-                                                &cell->axes[a].cvs[k].value));
-              if (k == nest->n - 1)
-                {
-                  if (a == t->summary_axis)
-                    {
-                      if (label)
-                        parent = pivot_category_create_group__ (parent, label);
-                      const struct ctables_summary_spec_set *specs = &nest->specs[cell->sv];
-                      for (size_t m = 0; m < specs->n; m++)
-                        {
-                          int leaf = pivot_category_create_leaf (
-                            parent, pivot_value_new_text (specs->specs[m].label));
-                          if (m == 0)
-                            prev_leaf = leaf;
-                        }
-                    }
-                  else
-                    {
-                      /* This assertion is true as long as the summary axis
-                         is the axis where the summaries are displayed. */
-                      assert (label);
-
-                      prev_leaf = pivot_category_create_leaf (parent, label);
-                    }
-                  break;
-                }
-
-              if (label)
-                parent = pivot_category_create_group__ (parent, label);
-
-              enum ctables_vlabel vlabel = ct->vlabels[var_get_dict_index (nest->vars[k + 1])];
-              if (vlabel != CTVL_NONE)
-                parent = pivot_category_create_group__ (
-                  parent, pivot_value_new_variable (nest->vars[k + 1]));
-              groups[k] = parent;
-            }
-
-          cell->axes[a].leaf = prev_leaf;
-        }
-      free (sorted);
-      free (groups);
-    }
-  struct ctables_cell *cell;
-  HMAP_FOR_EACH (cell, struct ctables_cell, node, &t->cells)
-    {
-      if (cell->hide)
-        continue;
-
-      const struct ctables_nest *nest = &t->stacks[t->summary_axis].nests[cell->axes[t->summary_axis].stack_idx];
-      const struct ctables_summary_spec_set *specs = &nest->specs[cell->sv];
-      for (size_t j = 0; j < specs->n; j++)
-        {
-          size_t dindexes[3];
-          size_t n_dindexes = 0;
-
-          for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
-            if (d[a])
-              {
-                int leaf = cell->axes[a].leaf;
-                if (a == t->summary_axis)
-                  leaf += j;
-                dindexes[n_dindexes++] = leaf;
-              }
-
-          double d = ctables_summary_value (cell, &cell->summaries[j], &specs->specs[j]);
-          struct pivot_value *value = pivot_value_new_number (d);
-          value->numeric.format = specs->specs[j].format;
-          pivot_table_put (pt, dindexes, n_dindexes, value);
-        }
-    }
-
-  pivot_table_submit (pt);
-}
-
 static struct pivot_value *
 ctables_category_create_label (const struct ctables_category *cat,
                                const struct variable *var,
@@ -2709,8 +2531,28 @@ ctables_category_create_label (const struct ctables_category *cat,
           : pivot_value_new_var_value (var, value));
 }
 
+static struct ctables_value *
+ctables_value_find__ (struct ctables_table *t, const union value *value,
+                      int width, unsigned int hash)
+{
+  struct ctables_value *clv;
+  HMAP_FOR_EACH_WITH_HASH (clv, struct ctables_value, node,
+                           hash, &t->clabels_values_map)
+    if (value_equal (value, &clv->value, width))
+      return clv;
+  return NULL;
+}
+
+static struct ctables_value *
+ctables_value_find (struct ctables_table *t,
+                    const union value *value, int width)
+{
+  return ctables_value_find__ (t, value, width,
+                               value_hash (value, width, 0));
+}
+
 static void
-ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t)
+ctables_table_output (struct ctables *ct, struct ctables_table *t)
 {
   struct pivot_table *pt = pivot_table_create__ (
     (t->title
@@ -2724,7 +2566,8 @@ ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t
     pivot_table_set_caption (
       pt, pivot_value_new_user_text (t->corner, SIZE_MAX));
 
-  if (t->summary_axis != t->slabels_axis)
+  bool summary_dimension = t->summary_axis != t->slabels_axis;
+  if (summary_dimension)
     {
       struct pivot_dimension *d = pivot_dimension_create (
         pt, t->slabels_axis, N_("Summaries"));
@@ -2734,7 +2577,8 @@ ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t
           d->root, pivot_value_new_text (specs->specs[i].label));
     }
 
-  if (t->clabels_example)
+  bool categories_dimension = t->clabels_example != NULL;
+  if (categories_dimension)
     {
       struct pivot_dimension *d = pivot_dimension_create (
         pt, t->label_axis[t->clabels_from_axis],
@@ -2749,7 +2593,7 @@ ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t
           const struct ctables_category *cat = ctables_categories_match (c, value, var);
           if (!cat)
             {
-              /* XXX probably missing */
+              pivot_category_create_leaf (d->root, pivot_value_new_integer (value->f)); /* XXX */
               continue;
             }
           pivot_category_create_leaf (d->root, ctables_category_create_label (
@@ -2831,32 +2675,10 @@ ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t
       for (size_t j = 0; j < n_sorted; j++)
         {
           struct ctables_cell *cell = sorted[j];
-          const struct ctables_nest *nest = &t->stacks[a].nests[cell->axes[a].stack_idx];
-
-          size_t n_common = 0;
-          bool new_subtable = false;
-          if (j > 0)
-            {
-              struct ctables_cell *prev = sorted[j - 1];
-              if (prev->axes[a].stack_idx == cell->axes[a].stack_idx)
-                {
-                  for (; n_common < nest->n; n_common++)
-                    if (n_common != nest->scale_idx
-                        && (prev->axes[a].cvs[n_common].category
-                            != cell->axes[a].cvs[n_common].category
-                            || !value_equal (&prev->axes[a].cvs[n_common].value,
-                                             &cell->axes[a].cvs[n_common].value,
-                                             var_get_type (nest->vars[n_common]))))
-                      break;
-                  if (a == PIVOT_AXIS_ROW)
-                    printf ("n_common=%zu\n", n_common);
-                }
-              else
-                new_subtable = true;
-            }
-          else
-            new_subtable = true;
+          struct ctables_cell *prev = j > 0 ? sorted[j - 1] : NULL;
+          const struct ctables_nest *nest = &t->stacks[a].nests[cell->axes[a].nest_idx];
 
+          bool new_subtable = !prev || prev->axes[a].nest_idx != cell->axes[a].nest_idx;
           if (new_subtable)
             {
               n_levels = 0;
@@ -2894,27 +2716,45 @@ ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t
                 }
               printf ("\n");
             }
-          if (a == PIVOT_AXIS_ROW)
-            printf ("n_common=%zu\n", n_common);
-          if (n_common == nest->n)
+
+          size_t n_common = 0;
+          if (!new_subtable)
             {
-              cell->axes[a].leaf = prev_leaf;
-              continue;
+              for (; n_common < n_levels; n_common++)
+                {
+                  const struct ctables_level *level = &levels[n_common];
+                  if (level->type == CTL_CATEGORY)
+                    {
+                      size_t var_idx = level->var_idx;
+                      if (prev->axes[a].cvs[var_idx].category
+                          != cell->axes[a].cvs[var_idx].category)
+                        {
+                          break;
+                        }
+                      else if (!value_equal (&prev->axes[a].cvs[var_idx].value,
+                                           &cell->axes[a].cvs[var_idx].value,
+                                             var_get_type (nest->vars[var_idx])))
+                        {
+                          break;
+                        }
+                    }
+                }
             }
 
-          for (size_t k = 0; k < n_levels; k++)
+          for (size_t k = n_common; k < n_levels; k++)
             {
               const struct ctables_level *level = &levels[k];
-              if (n_common > level->var_idx)
-                continue;
-
               struct pivot_category *parent = k ? groups[k - 1] : d[a]->root;
               if (level->type == CTL_SUMMARY)
                 {
                   const struct ctables_summary_spec_set *specs = &t->summary_specs;
                   for (size_t m = 0; m < specs->n; m++)
-                    pivot_category_create_leaf (
-                      parent, pivot_value_new_text (specs->specs[m].label));
+                    {
+                      int leaf = pivot_category_create_leaf (
+                        parent, pivot_value_new_text (specs->specs[m].label));
+                      if (!m)
+                        prev_leaf = leaf;
+                    }
                 }
               else
                 {
@@ -2932,7 +2772,7 @@ ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t
                     NOT_REACHED ();
 
                   if (k == n_levels - 1)
-                    pivot_category_create_leaf (parent, label);
+                    prev_leaf = pivot_category_create_leaf (parent, label);
                   else
                     groups[k] = pivot_category_create_group__ (parent, label);
                 }
@@ -2943,6 +2783,51 @@ ctables_table_output_different_axis (struct ctables *ct, struct ctables_table *t
       free (sorted);
       free (groups);
     }
+
+  struct ctables_cell *cell;
+  HMAP_FOR_EACH (cell, struct ctables_cell, node, &t->cells)
+    {
+      if (cell->hide)
+        continue;
+
+      const struct ctables_nest *specs_nest = &t->stacks[t->summary_axis].nests[cell->axes[t->summary_axis].nest_idx];
+      const struct ctables_summary_spec_set *specs = &specs_nest->specs[cell->sv];
+      for (size_t j = 0; j < specs->n; j++)
+        {
+          size_t dindexes[5];
+          size_t n_dindexes = 0;
+
+          if (summary_dimension)
+            dindexes[n_dindexes++] = specs->specs[j].axis_idx;
+
+          if (categories_dimension)
+            {
+              const struct ctables_nest *clabels_nest = &t->stacks[t->clabels_from_axis].nests[cell->axes[t->clabels_from_axis].nest_idx];
+              const struct variable *var = clabels_nest->vars[clabels_nest->n - 1];
+              const union value *value = &cell->axes[t->clabels_from_axis].cvs[clabels_nest->n - 1].value;
+              const struct ctables_value *ctv = ctables_value_find (t, value, var_get_width (var));
+
+              printf ("leaf=%d\n", ctv ? ctv->leaf : 0);
+              dindexes[n_dindexes++] = ctv ? ctv->leaf : 0; /* XXX */
+              //dindexes[n_dindexes++] = 0;
+            }
+
+          for (enum pivot_axis_type a = 0; a < PIVOT_N_AXES; a++)
+            if (d[a])
+              {
+                int leaf = cell->axes[a].leaf;
+                if (a == t->summary_axis && !summary_dimension)
+                  leaf += j;
+                dindexes[n_dindexes++] = leaf;
+              }
+
+          double d = ctables_summary_value (cell, &cell->summaries[j], &specs->specs[j]);
+          struct pivot_value *value = pivot_value_new_number (d);
+          value->numeric.format = specs->specs[j].format;
+          pivot_table_put (pt, dindexes, n_dindexes, value);
+        }
+    }
+
   pivot_table_submit (pt);
 }
 
@@ -3116,17 +3001,13 @@ ctables_insert_clabels_values (struct ctables_table *t, const struct ccase *c,
       const union value *value = case_data (c, v);
       unsigned int hash = value_hash (value, width, 0);
 
-      struct ctables_value *clv;
-      HMAP_FOR_EACH_WITH_HASH (clv, struct ctables_value, node, hash,
-                               &t->clabels_values_map)
-        if (value_equal (value, &clv->value, width))
-          goto next_stack;
-
-      clv = xmalloc (sizeof *clv);
-      value_clone (&clv->value, value, width);
-      hmap_insert (&t->clabels_values_map, &clv->node, hash);
-
-    next_stack: ;
+      struct ctables_value *clv = ctables_value_find__ (t, value, width, hash);
+      if (!clv)
+        {
+          clv = xmalloc (sizeof *clv);
+          value_clone (&clv->value, value, width);
+          hmap_insert (&t->clabels_values_map, &clv->node, hash);
+        }
     }
 }
 
@@ -3147,10 +3028,14 @@ ctables_sort_clabels_values (struct ctables_table *t)
   size_t n = hmap_count (&t->clabels_values_map);
   t->clabels_values = xnmalloc (n, sizeof *t->clabels_values);
 
-  const struct ctables_value *clv;
+  struct ctables_value *clv;
   size_t i = 0;
   HMAP_FOR_EACH (clv, struct ctables_value, node, &t->clabels_values_map)
-    t->clabels_values[i++] = clv->value;
+    {
+      clv->leaf = i;
+      t->clabels_values[i] = clv->value;
+      i++;
+    }
   t->n_clabels_values = n;
   assert (i == n);
 
@@ -3196,10 +3081,7 @@ ctables_execute (struct dataset *ds, struct ctables *ct)
       if (t->clabels_example)
         ctables_sort_clabels_values (t);
 
-      if (t->summary_axis == t->slabels_axis)
-        ctables_table_output_same_axis (ct, ct->tables[i]);
-      else
-        ctables_table_output_different_axis (ct, ct->tables[i]);
+      ctables_table_output (ct, ct->tables[i]);
     }
   return proc_commit (ds);
 }