union value ;
-struct categoricals *categoricals_create (const struct variable **v, size_t n_vars,
+struct categoricals *categoricals_create (const struct variable *const *v, size_t n_vars,
const struct variable *wv, enum mv_class exclude);
void categoricals_destroy (struct categoricals *);
/* Return the total number of categories */
size_t categoricals_total (const struct categoricals *cat);
-/* Return the index for variable N */
-int categoricals_index (const struct categoricals *cat, size_t n, const union value *val);
+/*
+ Return the total number of variables which participated in these categoricals.
+ Due to the possibility of missing values, this is NOT necessarily
+ equal to the number of variables passed in when the object was
+ created.
+*/
+size_t categoricals_get_n_variables (const struct categoricals *cat);
void categoricals_done (struct categoricals *cat);
const union value * categoricals_get_value_by_subscript (const struct categoricals *cat, int subscript);
+double categoricals_get_weight_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);
+
+
+
#endif