categoricals_destroy ( struct categoricals *cat)
{
int i;
- for (i = 0 ; i < cat->n_vp; ++i)
- hmap_destroy (&cat->vp[i].map);
-
- pool_destroy (cat->pool);
- free (cat);
+ if (cat != NULL)
+ {
+ for (i = 0 ; i < cat->n_vp; ++i)
+ hmap_destroy (&cat->vp[i].map);
+
+ pool_destroy (cat->pool);
+ free (cat);
+ }
}
+#if 0
void
categoricals_dump (const struct categoricals *cat)
{
for (node = hmap_first (m); node; node = hmap_next (m, node))
{
struct string s;
- ds_init_empty (&s);
const struct value_node *vn = HMAP_DATA (node, struct value_node, node);
+ ds_init_empty (&s);
var_append_value_name (vp->var, &vn->value, &s);
printf ("Value: %s; Index %d; CC %g\n",
ds_cstr (&s),
printf ("Number of categorical variables: %d\n", cat->n_vp);
printf ("Number of non-empty categorical variables: %d\n", cat->n_vars);
printf ("Total number of categories: %d\n", cat->n_cats_total);
+
+ printf ("\nReverse variable map:\n");
+
+ for (v = 0 ; v < cat->n_cats_total; ++v)
+ printf ("%d ", cat->reverse_variable_map[v]);
+ printf ("\n");
}
+#endif
struct categoricals *
-categoricals_create (const struct variable **v, size_t n_vars,
+categoricals_create (const struct variable *const *v, size_t n_vars,
const struct variable *wv, enum mv_class exclude)
{
size_t i;
}
-/* Return the index for value VAL in the Nth variable */
-int
-categoricals_index (const struct categoricals *cat, size_t n, const union value *val)
-{
- struct value_node *vn = lookup_value (&cat->vp[n].map, cat->vp[n].var, val);
-
- if ( vn == NULL)
- return -1;
-
- return vn->subscript;
-}
-
-
/* Return the total number of categories */
size_t
categoricals_total (const struct categoricals *cat)
*/
int v;
int idx = 0;
- cat->reverse_variable_map = pool_calloc (cat->pool, cat->n_cats_total, sizeof *cat->reverse_variable_map);
+ cat->reverse_variable_map = pool_calloc (cat->pool,
+ cat->n_cats_total,
+ sizeof *cat->reverse_variable_map);
for (v = 0 ; v < cat->n_vp; ++v)
{
vp->reverse_value_map[vn->subscript] = vn;
}
+ /* Populate the reverse variable map.
+ */
for (i = 0; i < vp->n_cats; ++i)
cat->reverse_variable_map[idx++] = v;
}
}
+static int
+reverse_variable_lookup (const struct categoricals *cat, int subscript)
+{
+ assert (cat->reverse_variable_map);
+ assert (subscript >= 0);
+ assert (subscript < cat->n_cats_total);
+
+ return cat->reverse_variable_map[subscript];
+}
+
/* Return the categorical variable corresponding to SUBSCRIPT */
const struct variable *
categoricals_get_variable_by_subscript (const struct categoricals *cat, int subscript)
{
- int index;
-
- assert (cat->reverse_variable_map);
-
- index = cat->reverse_variable_map[subscript];
+ int index = reverse_variable_lookup (cat, subscript);
return cat->vp[index].var;
}
-
/* Return the value corresponding to SUBSCRIPT */
const union value *
categoricals_get_value_by_subscript (const struct categoricals *cat, int subscript)
{
- int vindex = cat->reverse_variable_map[subscript];
+ int vindex = reverse_variable_lookup (cat, subscript);
const struct var_params *vp = &cat->vp[vindex];
const struct value_node *vn = vp->reverse_value_map [subscript - vp->base_subscript];
double
categoricals_get_weight_by_subscript (const struct categoricals *cat, int subscript)
{
- int vindex = cat->reverse_variable_map[subscript];
+ int vindex = reverse_variable_lookup (cat, subscript);
const struct var_params *vp = &cat->vp[vindex];
return vp->cc;
double
categoricals_get_sum_by_subscript (const struct categoricals *cat, int subscript)
{
- int vindex = cat->reverse_variable_map[subscript];
+ int vindex = reverse_variable_lookup (cat, subscript);
const struct var_params *vp = &cat->vp[vindex];
const struct value_node *vn = vp->reverse_value_map [subscript - vp->base_subscript];