int n_vals; /* Number of values for this variable */
};
-static void UNUSED
-dump_interaction (const struct interaction *iact)
-{
- if (CATEGORICALS_DEBUG)
- {
- struct string str = DS_EMPTY_INITIALIZER;
- interaction_to_string (iact, &str);
- printf ("Interaction: %s\n", ds_cstr (&str));
- ds_destroy (&str);
- }
-}
-
static struct variable_node *
lookup_variable (const struct hmap *map, const struct variable *var, unsigned int hash)
{
struct interact_params
{
- /* A map indexed by a interaction_value */
+ /* A map of cases indexed by a interaction_value */
struct hmap ivmap;
- const struct interaction *iact;
+ struct interaction *iact;
int base_subscript_short;
int base_subscript_long;
struct pool *pool;
- /* Missing values to be excluded */
- enum mv_class exclude;
+ /* Missing values in the dependent varirable to be excluded */
+ enum mv_class dep_excl;
+
+ /* Missing values in the factor variables to be excluded */
+ enum mv_class fctr_excl;
const void *aux1;
void *aux2;
+ bool sane;
+
const struct payload *payload;
};
-static void UNUSED
+static void
categoricals_dump (const struct categoricals *cat)
{
if (CATEGORICALS_DEBUG)
/* Interate over each interaction value, and unref any cases that we reffed */
HMAP_FOR_EACH (iv, struct interaction_value, node, &cat->iap[i].ivmap)
{
-#if 0
- if (cat->payload)
- cat->payload->destroy (cat->aux1, iv->user_data);
-#endif
+ if (cat->payload && cat->payload->destroy)
+ cat->payload->destroy (cat->aux1, cat->aux2, iv->user_data);
case_unref (iv->ccase);
}
free (cat->iap[i].enc_sum);
free (cat->iap[i].df_prod);
hmap_destroy (&cat->iap[i].ivmap);
+ interaction_destroy (cat->iap[i].iact);
}
/* Interate over each variable and delete its value map */
return iv;
}
+bool
+categoricals_sane (const struct categoricals *cat)
+{
+ return cat->sane;
+}
struct categoricals *
categoricals_create (struct interaction *const*inter, size_t n_inter,
- const struct variable *wv, enum mv_class exclude)
+ const struct variable *wv, enum mv_class dep_excl, enum mv_class fctr_excl)
{
size_t i;
struct categoricals *cat = xmalloc (sizeof *cat);
cat->reverse_variable_map_short = NULL;
cat->reverse_variable_map_long = NULL;
cat->pool = pool_create ();
- cat->exclude = exclude;
+ cat->dep_excl = dep_excl;
+ cat->fctr_excl = fctr_excl;
cat->payload = NULL;
cat->aux2 = NULL;
+ cat->sane = false;
cat->iap = pool_calloc (cat->pool, cat->n_iap, sizeof *cat->iap);
{
int i;
struct variable_node *vn = NULL;
- const double weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
+ double weight;
+
+ if (NULL == cat)
+ return;
+
+ weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
assert (NULL == cat->reverse_variable_map_short);
assert (NULL == cat->reverse_variable_map_long);
size_t hash;
struct interaction_value *node;
- if ( interaction_case_is_missing (iact, c, cat->exclude))
+ if ( interaction_case_is_missing (iact, c, cat->fctr_excl))
continue;
hash = interaction_case_hash (iact, c, 0);
size_t
categoricals_df_total (const struct categoricals *cat)
{
+ if (NULL == cat)
+ return 0;
+
return cat->df_sum;
}
/* This function must be called *before* any call to categoricals_get_*_by subscript and
*after* all calls to categoricals_update */
-bool
+void
categoricals_done (const struct categoricals *cat_)
{
/* Implementation Note: Whilst this function is O(n) in cat->n_cats_total, in most
int i;
int idx_short = 0;
int idx_long = 0;
+
+ if (NULL == cat)
+ return;
+
cat->df_sum = 0;
cat->n_cats_total = 0;
struct variable_node *vn = lookup_variable (&cat->varmap, var, hash_pointer (var, 0));
if (hmap_count (&vn->valmap) == 0)
- return false;
+ {
+ cat->sane = false;
+ return;
+ }
cat->iap[i].df_prod[v] = df * (hmap_count (&vn->valmap) - 1);
df = cat->iap[i].df_prod[v];
assert (cat->n_vars <= cat->n_iap);
- // categoricals_dump (cat);
+ categoricals_dump (cat);
/* Tally up the sums for all the encodings */
for (i = 0 ; i < cat->n_iap; ++i)
const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \
iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc;
}
+ if (cat->payload && cat->payload->calculate)
+ cat->payload->calculate (cat->aux1, cat->aux2, iv->user_data);
}
}
- return true;
+ cat->sane = true;
}
const struct ccase *
categoricals_get_case_by_category_real (const struct categoricals *cat, int iact, int n)
{
+ const struct interaction_value *vn;
+
const struct interact_params *vp = &cat->iap[iact];
- const struct interaction_value *vn = vp->reverse_interaction_value_map [n];
+
+ if ( n >= hmap_count (&vp->ivmap))
+ return NULL;
+
+ vn = vp->reverse_interaction_value_map [n];
return vn->ccase;
}
categoricals_get_user_data_by_category_real (const struct categoricals *cat, int iact, int n)
{
const struct interact_params *vp = &cat->iap[iact];
- const struct interaction_value *iv = vp->reverse_interaction_value_map [n];
+ const struct interaction_value *iv ;
+
+ if ( n >= hmap_count (&vp->ivmap))
+ return NULL;
+
+ iv = vp->reverse_interaction_value_map [n];
return iv->user_data;
}