}
+#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 ("\nReverse variable map:\n");
- for (v = 0 ; v < cat->n_cats_total - cat->n_vars; ++v)
+ 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;
int v;
int idx = 0;
cat->reverse_variable_map = pool_calloc (cat->pool,
- cat->n_cats_total - cat->n_vars,
+ cat->n_cats_total,
sizeof *cat->reverse_variable_map);
for (v = 0 ; v < cat->n_vp; ++v)
}
/* Populate the reverse variable map.
- This implementation considers the first value of each categorical variable
- as the basis. Therefore, this loop starts from 1 instead of 0 */
- for (i = 1; i < vp->n_cats; ++i)
+ */
+ for (i = 0; i < vp->n_cats; ++i)
cat->reverse_variable_map[idx++] = v;
}
{
assert (cat->reverse_variable_map);
assert (subscript >= 0);
- assert (subscript < cat->n_cats_total - cat->n_vars);
+ assert (subscript < cat->n_cats_total);
return cat->reverse_variable_map[subscript];
}