categoricals_create (struct interaction *const *inter, size_t n_inter,
const struct variable *wv, enum mv_class fctr_excl)
{
- struct categoricals *cat = xzalloc (sizeof *cat);
+ struct categoricals *cat = XZALLOC (struct categoricals);
cat->iap = pool_calloc (cat->pool, n_inter, sizeof *cat->iap);
cat->n_iap = n_inter;
cat->wv = wv;
assert (!cat->cat_to_iact);
double weight;
- weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
+ weight = cat->wv ? case_num (c, cat->wv) : 1.0;
weight = var_force_valid_weight (cat->wv, weight, NULL);
/* Update the frequency table for each variable. */
{
valn = pool_malloc (cat->pool, sizeof *valn);
valn->index = -1;
- value_init (&valn->val, width);
+ value_init_pool (cat->pool, &valn->val, width);
value_copy (&valn->val, val, width);
hmap_insert (&vn->valmap, &valn->node, hash);
}
return;
}
- struct value_node **nodes = xcalloc (sizeof *nodes, n_vals);
+ struct value_node **nodes = XCALLOC (n_vals, struct value_node *);
int x = 0;
struct value_node *valnd;
HMAP_FOR_EACH (valnd, struct value_node, node, &vn->valmap)