typedef void *user_data_create_func (void *aux1, void *aux2);
-struct categoricals *categoricals_create (const struct interaction **, size_t n_int,
+struct categoricals *categoricals_create (struct interaction *const *, size_t n_int,
const struct variable *wv, enum mv_class exclude,
user_data_create_func *udf,
update_func *update, void *aux1, void *aux2);
/* Return the number of categories (distinct values) for variable N */
size_t categoricals_n_count (const struct categoricals *cat, size_t n);
+size_t categoricals_df (const struct categoricals *cat, size_t n);
/* Return the total number of categories */
-size_t categoricals_total (const struct categoricals *cat);
+size_t categoricals_n_total (const struct categoricals *cat);
+
+/* Return the total degrees of freedom */
+size_t categoricals_df_total (const struct categoricals *cat);
+
/*
Return the total number of variables which participated in these categoricals.
size_t categoricals_get_n_variables (const struct categoricals *cat);
+bool categoricals_is_complete (const struct categoricals *cat);
+
+
/*
Must be called (once) before any call to the *_by_subscript or *_by_category
- functions, but AFTER any calls to categoricals_update
+ functions, but AFTER any calls to categoricals_update.
+ If this function returns false, then no calls to _by_subscript or *_by_category
+ are allowed.
*/
-void categoricals_done (const struct categoricals *cat);
+bool categoricals_done (const struct categoricals *cat);
/*
the total number of distinct values of each categorical variable should
be considered.
*/
-const struct variable * categoricals_get_variable_by_subscript (const struct categoricals *cat, int subscript);
-
double categoricals_get_weight_by_subscript (const struct categoricals *cat, int subscript);
+const struct interaction *categoricals_get_interaction_by_subscript (const struct categoricals *cat, int subscript);
double categoricals_get_sum_by_subscript (const struct categoricals *cat, int subscript);
-double categoricals_get_binary_by_subscript (const struct categoricals *cat, int subscript,
- const struct ccase *c);
+double categoricals_get_code_for_case (const struct categoricals *cat, int subscript, const struct ccase *c);
/* These use the long map. Useful for descriptive statistics. */