Categoricals: Sort the reverse value map.

[pspp] / src / math / categoricals.c

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index ef9c528994428775614adedc1e59ab0949fb1ebc..c8b337e452012f03c2d16f5229f2253441a16b21 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -26,6 +26,7 @@
 #include <data/value.h>
 #include <libpspp/hmap.h>
 #include <libpspp/pool.h>
+#include <libpspp/array.h>
 
 #include <libpspp/str.h>
 
@@ -41,7 +42,6 @@ struct value_node
                                 Can be used as an index into an array */
 };
 
-
 struct var_params
 {
   /* A map indexed by a union values */
@@ -62,6 +62,18 @@ struct var_params
 };
 
 
+/* Comparison function to sort the reverse_value_map in ascending order */
+static int
+compare_value_node (const void *vn1_, const void *vn2_, const void *aux)
+{
+  const struct value_node * const *vn1 = vn1_;
+  const struct value_node * const *vn2 = vn2_;
+  const struct var_params *vp = aux;
+
+  return value_compare_3way (&(*vn1)->value, &(*vn2)->value, var_get_width (vp->var));
+}
+
+
 struct categoricals
 {
   /* The weight variable */
@@ -88,16 +100,15 @@ struct categoricals
   /* Missing values to be excluded */
   enum mv_class exclude;
 
-
-
   /* Function to be called on each update */
   update_func *update;
 
-  /* Auxilliary data to be passed to update */
-  void *update_aux;
-
   /* Function specified by the caller to create user_data */
   user_data_create_func *user_data_create;
+
+  /* Auxilliary data to be passed to update and user_data_create_func*/
+  void *aux1;
+  void *aux2;
 };
 
 
@@ -197,7 +208,7 @@ struct categoricals *
 categoricals_create (const struct variable *const *v, size_t n_vars,
                     const struct variable *wv, enum mv_class exclude,
                     user_data_create_func *udf,
-                    update_func *update, void *aux
+                    update_func *update, void *aux1, void *aux2
                     )
 {
   size_t i;
@@ -211,9 +222,12 @@ categoricals_create (const struct variable *const *v, size_t n_vars,
   cat->pool = pool_create ();
   cat->exclude = exclude;
   cat->update = update;
-  cat->update_aux = aux;
   cat->user_data_create = udf;
 
+  cat->aux1 = aux1;
+  cat->aux2 = aux2;
+
+
   cat->vp = pool_calloc (cat->pool, cat->n_vp, sizeof *cat->vp);
 
   for (i = 0 ; i < cat->n_vp; ++i)
@@ -266,15 +280,15 @@ categoricals_update (struct categoricals *cat, const struct ccase *c)
 
          node->subscript = cat->vp[i].n_cats++ ;
 
-         if ( cat->user_data_create )
-           node->user_data = cat->user_data_create ();
+         if (cat->user_data_create)
+           node->user_data = cat->user_data_create (cat->aux1, cat->aux2);
        }
 
       node->cc += weight;
       cat->vp[i].cc += weight;
 
-      if ( cat->update)
-       cat->update (node->user_data, cat->wv, var, c, cat->update_aux);
+      if (cat->update)
+       cat->update (node->user_data, cat->exclude, cat->wv, var, c, cat->aux1, cat->aux2);
     }
 }
 
@@ -328,6 +342,10 @@ categoricals_done (struct categoricals *cat)
          vp->reverse_value_map[vn->subscript] = vn;
        }
 
+      /* For some purposes (eg CONTRASTS in ONEWAY) the values need to be sorted */
+      sort (vp->reverse_value_map, vp->n_cats, sizeof (const struct value_node *),
+           compare_value_node, vp);
+
       /* Populate the reverse variable map.
        */
       for (i = 0; i < vp->n_cats; ++i)
@@ -335,6 +353,7 @@ categoricals_done (struct categoricals *cat)
     }
 
   assert (cat->n_vars <= cat->n_vp);
+
 }