#include <data/value.h>
#include <libpspp/hmap.h>
#include <libpspp/pool.h>
+#include <libpspp/array.h>
#include <libpspp/str.h>
Can be used as an index into an array */
};
-
struct var_params
{
/* A map indexed by a union values */
};
+/* 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 */
/* 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;
};
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;
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)
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);
}
}
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)
}
assert (cat->n_vars <= cat->n_vp);
+
}