category sort implicitly

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

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 07de68d919361ecb73cd7c8b269b1698b21295f7..64ef2a5e64b91607e28f65cf68f4dc609bfb17ec 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -388,6 +388,10 @@ struct ctables_cat_value
       };
   };
 
+static const struct ctables_cat_value *ctables_categories_match (
+  const struct ctables_categories *, const union value *,
+  const struct variable *);
+
 static void
 ctables_cat_value_uninit (struct ctables_cat_value *cv)
 {
@@ -1902,11 +1906,51 @@ ctables_freq_compare_3way (const void *a_, const void *b_, const void *aux_)
   for (size_t i = 0; i < va->n; i++)
     if (i != va->scale_idx)
       {
-        int cmp = value_compare_3way (&a->axes[aux->a].values[i],
-                                      &b->axes[aux->a].values[i],
-                                      var_get_width (va->vars[i]));
-        if (cmp)
+        const struct variable *var = va->vars[i];
+        const union value *val_a = &a->axes[aux->a].values[i];
+        const union value *val_b = &b->axes[aux->a].values[i];
+        int cmp = value_compare_3way (val_a, val_b, var_get_width (var));
+        if (!cmp)
+          continue;
+
+        const struct ctables_categories *cats = aux->t->categories[var_get_dict_index (var)];
+        if (!cats)
           return cmp;
+        else if (cats->n_values)
+          {
+            const struct ctables_cat_value *a_cv = ctables_categories_match (cats, val_a, var);
+            const struct ctables_cat_value *b_cv = ctables_categories_match (cats, val_b, var);
+            assert (a_cv && b_cv);
+            return (a_cv == b_cv ? cmp
+                    : a_cv > b_cv ? 1
+                    : -1);
+          }
+        else
+          {
+            switch (cats->key)
+              {
+              case CTCS_VALUE:
+                /* Nothing to do. */
+                break;
+
+              case CTCS_LABEL:
+                {
+                  const char *a_label = var_lookup_value_label (var, val_a);
+                  const char *b_label = var_lookup_value_label (var, val_b);
+                  int label_cmp = (a_label
+                                   ? (b_label ? strcmp (a_label, b_label) : 1)
+                                   : (b_label ? -1 : 0));
+                  if (label_cmp)
+                    cmp = label_cmp;
+                }
+                break;
+
+              case CTCS_FUNCTION:
+                NOT_REACHED ();
+              }
+
+            return cats->sort_ascending ? cmp : -cmp;
+          }
       }
   return 0;
 }
@@ -2042,12 +2086,29 @@ ctables_freqtab_insert (struct ctables_table *t,
           if (i == va->scale_idx)
             continue;
 
-          const struct ctables_categories *cats = t->categories[var_get_dict_index (va->vars[i])];
-          if (!cats || !cats->n_values)
-            continue;
+          const struct variable *var = va->vars[i];
+          const union value *value = case_data (c, var);
 
-          if (!ctables_categories_match (cats, case_data (c, va->vars[i]), va->vars[i]))
+          enum mv_class missing = var_is_value_missing (var, value);
+          if (missing == MV_SYSTEM)
             return;
+
+          const struct ctables_categories *cats = t->categories[var_get_dict_index (var)];
+          if (!cats)
+            {
+              if (missing)
+                return;
+            }
+          else if (cats->n_values)
+            {
+              if (!ctables_categories_match (cats, value, var))
+                return;
+            }
+          else
+            {
+              if (missing && !cats->include_missing)
+                return;
+            }
         }
     }