union value val; /* The value */
- void *user_data; /* A pointer to data which the caller can store stuff */
};
struct interaction_value
/* Total of the weights of cases matching this interaction */
double cc;
+
+ void *user_data; /* A pointer to data which the caller can store stuff */
};
static struct value_node *
};
-#if 0
/* 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)
+compare_interaction_value_3way (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 interact_params *vp = aux;
+ const struct interaction_value *const *vn1p = vn1_;
+ const struct interaction_value *const *vn2p = vn2_;
- return interaction_case_cmp_3way (vp->iact, (*vn1)->ccase, (*vn2)->ccase);
+ const struct interact_params *iap = aux;
+
+ return interaction_case_cmp_3way (iap->iact, (*vn1p)->ccase, (*vn2p)->ccase);
}
-#endif
struct categoricals
{
categoricals_dump (const struct categoricals *cat)
{
int i;
-#if 1
+
printf ("Reverse Variable Map (short):\n");
for (i = 0; i < cat->df_sum; ++i)
{
}
printf ("\n");
+ printf ("Reverse Variable Map (long):\n");
+ for (i = 0; i < cat->n_cats_total; ++i)
+ {
+ printf (" %d", cat->reverse_variable_map_long[i]);
+ }
+ printf ("\n");
+
+
printf ("Number of interactions %d\n", cat->n_iap);
for (i = 0 ; i < cat->n_iap; ++i)
{
}
printf (")\n");
}
-#endif
}
void
categoricals_destroy (struct categoricals *cat)
{
+ struct variable_node *vn = NULL;
+ int i;
+ if (NULL == cat)
+ return;
+ for (i = 0; i < cat->n_iap; ++i)
+ {
+ struct interaction_value *iv = NULL;
+ /* Interate over each interaction value, and unref any cases that we reffed */
+ HMAP_FOR_EACH (iv, struct interaction_value, node, &cat->iap[i].ivmap)
+ {
+ case_unref (iv->ccase);
+ }
+ hmap_destroy (&cat->iap[i].ivmap);
+ }
+
+ /* Interate over each variable and delete its value map */
+ HMAP_FOR_EACH (vn, struct variable_node, node, &cat->varmap)
+ {
+ hmap_destroy (&vn->valmap);
+ }
+
+ hmap_destroy (&cat->varmap);
+
+ pool_destroy (cat->pool);
+
free (cat);
}
struct categoricals *
-categoricals_create (const struct interaction **inter, size_t n_inter,
+categoricals_create (struct interaction *const*inter, size_t n_inter,
const struct variable *wv, enum mv_class exclude,
user_data_create_func *udf,
update_func *update, void *aux1, void *aux2
hmap_insert (&cat->iap[i].ivmap, &node->node, hash);
- // if (cat->user_data_create)
- // node->user_data = cat->user_data_create (cat->aux1, cat->aux2);
+ if (cat->user_data_create)
+ node->user_data = cat->user_data_create (cat->aux1, cat->aux2);
}
else
{
}
cat->iap[i].cc += weight;
- // if (cat->update)
- // cat->update (node->user_data, cat->exclude, cat->wv, NULL, c, cat->aux1, cat->aux2);
-
+ if (cat->update)
+ cat->update (node->user_data, cat->exclude, cat->wv, NULL, c, cat->aux1, cat->aux2);
}
}
size_t
categoricals_n_total (const struct categoricals *cat)
{
+ assert (cat->reverse_variable_map_long);
+
return cat->n_cats_total;
}
iap->reverse_interaction_value_map = pool_calloc (cat->pool, iap->n_cats,
sizeof *iap->reverse_interaction_value_map);
-
HMAP_FOR_EACH (ivn, struct interaction_value, node, &iap->ivmap)
{
iap->reverse_interaction_value_map[x++] = ivn;
}
-#if 0
+ assert (x <= iap->n_cats);
+
/* For some purposes (eg CONTRASTS in ONEWAY) the values need to be sorted */
- sort (vp->reverse_interaction_value_map, vp->n_cats, sizeof (const struct interaction_value *),
- compare_value_node, vp);
-#endif
+ sort (iap->reverse_interaction_value_map, x, sizeof (*iap->reverse_interaction_value_map),
+ compare_interaction_value_3way, iap);
+
+ /* Fill the remaining values with null */
+ for (ii = x ; ii < iap->n_cats; ++ii)
+ iap->reverse_interaction_value_map[ii] = NULL;
/* Populate the reverse variable maps. */
for (ii = 0; ii < iap->df; ++ii)
cat->reverse_variable_map_long[idx_long++] = i;
}
-
-
assert (cat->n_vars <= cat->n_iap);
+
+ // categoricals_dump (cat);
}
static int
reverse_variable_lookup_long (const struct categoricals *cat, int subscript)
{
- printf ("%s\n", __FUNCTION__);
assert (cat->reverse_variable_map_long);
assert (subscript >= 0);
assert (subscript < cat->n_cats_total);
int vindex = reverse_variable_lookup_short (cat, subscript);
const struct interact_params *vp = &cat->iap[vindex];
const struct interaction_value *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_short];
+
+ if ( vn == NULL)
+ return NULL;
+
return vn->ccase;
}
const struct interaction_value *iv = vp->reverse_interaction_value_map [subscript - vp->base_subscript_short];
+ if (iv == NULL)
+ return 0;
+
return iv->cc;
}
const struct ccase *c2 = categoricals_get_case_by_subscript (cat, subscript);
+ if ( c2 == NULL)
+ return 0;
+
return interaction_case_equal (iact, c, c2);
}
return cat->n_vars;
}
-
-
/* Return a case containing the set of values corresponding to SUBSCRIPT */
const struct ccase *
categoricals_get_case_by_category (const struct categoricals *cat, int subscript)
{
int vindex = reverse_variable_lookup_long (cat, subscript);
const struct interact_params *vp = &cat->iap[vindex];
- // const struct interaction_value *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
+ const struct interaction_value *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
- // return vn->ccase;
- return NULL;
+ return vn->ccase;
}
void *
int vindex = reverse_variable_lookup_long (cat, subscript);
const struct interact_params *vp = &cat->iap[vindex];
- //const struct value_node *vn = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
- //return vn->user_data;
- assert (0);
- return NULL;
+ const struct interaction_value *iv = vp->reverse_interaction_value_map [subscript - vp->base_subscript_long];
+ return iv->user_data;
}