/* PSPP - a program for statistical analysis.
- Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
/* Missing values to be excluded */
enum mv_class exclude;
- /* Function to be called on each update */
- update_func *update;
-
- /* Function specified by the caller to create user_data */
- user_data_create_func *user_data_create;
-
- /* Auxilliary data to be passed to update and user_data_create_func*/
- void *aux1;
+ const void *aux1;
void *aux2;
+
+ const struct payload *payload;
};
#if 0
/* 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
case_unref (iv->ccase);
}
struct categoricals *
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
- )
+ const struct variable *wv, enum mv_class exclude)
{
size_t i;
struct categoricals *cat = xmalloc (sizeof *cat);
cat->reverse_variable_map_long = NULL;
cat->pool = pool_create ();
cat->exclude = exclude;
- cat->update = update;
- cat->user_data_create = udf;
-
- cat->aux1 = aux1;
- cat->aux2 = aux2;
+ cat->payload = NULL;
+ cat->aux2 = NULL;
cat->iap = pool_calloc (cat->pool, cat->n_iap, sizeof *cat->iap);
{
const struct interaction *iact = cat->iap[i].iact;
- // if ( interaction_case_is_missing (iact, c, cat->exclude))
- // continue;
+ size_t hash;
+ struct interaction_value *node;
+
+ if ( interaction_case_is_missing (iact, c, cat->exclude))
+ continue;
- size_t hash = interaction_case_hash (iact, c, 0);
- struct interaction_value *node = lookup_case (&cat->iap[i].ivmap, iact, c);
+ hash = interaction_case_hash (iact, c, 0);
+ node = lookup_case (&cat->iap[i].ivmap, iact, c);
if ( NULL == node)
{
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->payload)
+ {
+ node->user_data = cat->payload->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->payload)
+ {
+ double weight = cat->wv ? case_data (c, cat->wv)->f : 1.0;
+ cat->payload->update (cat->aux1, cat->aux2, node->user_data, c, weight);
+ }
+
}
}
size_t
categoricals_n_total (const struct categoricals *cat)
{
- assert (cat->reverse_variable_map_long);
+ if (!categoricals_is_complete (cat))
+ return 0;
return cat->n_cats_total;
}
return cat->df_sum;
}
+bool
+categoricals_is_complete (const struct categoricals *cat)
+{
+ return (NULL != cat->reverse_variable_map_short);
+}
+
+
/* This function must be called *before* any call to categoricals_get_*_by subscript and
*after* all calls to categoricals_update */
-void
+bool
categoricals_done (const struct categoricals *cat_)
{
/* Implementation Note: Whilst this function is O(n) in cat->n_cats_total, in most
struct variable_node *vn = lookup_variable (&cat->varmap, var, hash_pointer (var, 0));
+ if (hmap_count (&vn->valmap) == 0)
+ return false;
+
cat->iap[i].df_prod[v] = df * (hmap_count (&vn->valmap) - 1);
df = cat->iap[i].df_prod[v];
struct interaction_value *iv = iap->reverse_interaction_value_map[y];
for (x = iap->base_subscript_short; x < iap->base_subscript_short + df ;++x)
{
- const double bin = categoricals_get_binary_by_subscript (cat, x, iv->ccase); \
+ const double bin = categoricals_get_code_for_case (cat, x, iv->ccase); \
iap->enc_sum [x - iap->base_subscript_short] += bin * iv->cc;
}
}
}
+
+ return true;
}
return cat->iap[index].iact;
}
-/* Return the case corresponding to SUBSCRIPT */
-static const struct ccase *
-categoricals_get_case_by_subscript (const struct categoricals *cat, int subscript)
-{
- 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;
-}
-
-
double
categoricals_get_weight_by_subscript (const struct categoricals *cat, int subscript)
{
/* Returns unity if the value in case C at SUBSCRIPT is equal to the category
for that subscript */
double
-categoricals_get_binary_by_subscript (const struct categoricals *cat,
- int subscript,
+categoricals_get_code_for_case (const struct categoricals *cat, int subscript,
const struct ccase *c)
{
const struct interaction *iact = categoricals_get_interaction_by_subscript (cat, subscript);
return cat->n_vars;
}
+
+/* Return a case containing the set of values corresponding to
+ the Nth Category of the IACTth interaction */
+const struct ccase *
+categoricals_get_case_by_category_real (const struct categoricals *cat, int iact, int n)
+{
+ const struct interact_params *vp = &cat->iap[iact];
+ const struct interaction_value *vn = vp->reverse_interaction_value_map [n];
+
+ return vn->ccase;
+}
+
+/* Return a the user data corresponding to the Nth Category of the IACTth interaction. */
+void *
+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];
+
+ return iv->user_data;
+}
+
+
+
/* 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)
}
+\f
-
+void
+categoricals_set_payload (struct categoricals *cat, const struct payload *p,
+ const void *aux1, void *aux2)
+{
+ cat->payload = p;
+ cat->aux1 = aux1;
+ cat->aux2 = aux2;
+}
projects / pspp-builds.git / blobdiff