basics work now

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 3240d48dd056bdcd4d2d24e3e6d11a2e62be881f..fb8bb3a113008c182828b1612af925af08673e1a 100644 (file)
--- 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);
@@ -2530,6 +2531,26 @@ 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 (struct ctables *ct, struct ctables_table *t)
 {
@@ -2572,7 +2593,7 @@ ctables_table_output (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 (
@@ -2655,9 +2676,9 @@ ctables_table_output (struct ctables *ct, struct ctables_table *t)
         {
           struct ctables_cell *cell = sorted[j];
           struct ctables_cell *prev = j > 0 ? sorted[j - 1] : NULL;
-          const struct ctables_nest *nest = &t->stacks[a].nests[cell->axes[a].stack_idx];
+          const struct ctables_nest *nest = &t->stacks[a].nests[cell->axes[a].nest_idx];
 
-          bool new_subtable = !prev || prev->axes[a].stack_idx != cell->axes[a].stack_idx;
+          bool new_subtable = !prev || prev->axes[a].nest_idx != cell->axes[a].nest_idx;
           if (new_subtable)
             {
               n_levels = 0;
@@ -2769,8 +2790,8 @@ ctables_table_output (struct ctables *ct, struct ctables_table *t)
       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];
+      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];
@@ -2781,7 +2802,14 @@ ctables_table_output (struct ctables *ct, struct ctables_table *t)
 
           if (categories_dimension)
             {
-              dindexes[n_dindexes++] = 0; /* XXX */
+              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++)
@@ -2973,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);
+        }
     }
 }
 
@@ -3004,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);