X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.h;h=02fef13a303d17d717ef07df8b54c58a5302a2cc;hb=a9c5233f04317a5ace5e6dcbe3cc61a9f07d57c0;hp=697d846b48351c729b7cc6013aab8099aebbf3bd;hpb=46fdaed173d06e42dac6712e142bc9f7898075d7;p=pspp

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index 697d846b48..02fef13a30 100644
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -27,8 +27,18 @@ struct ccase;
 
 union value ;
 
-struct categoricals *categoricals_create (const struct variable **v, size_t n_vars,
-					  const struct variable *wv, enum mv_class exclude);
+typedef void update_func (void *user_data,
+			  const struct variable *wv, 
+			  const struct variable *catvar,
+			  const struct ccase *c,
+			  void *aux1, void *aux2);
+
+typedef void *user_data_create_func (void *aux1, void *aux2);
+
+struct categoricals *categoricals_create (const struct variable *const *v, size_t n_vars,
+					  const struct variable *wv, enum mv_class exclude,
+					  user_data_create_func *udf,
+					  update_func *update, void *aux1, void *aux2);
 
 void categoricals_destroy (struct categoricals *);
 
@@ -50,9 +60,6 @@ size_t categoricals_total (const struct categoricals *cat);
 */
 size_t categoricals_get_n_variables (const struct categoricals *cat);
 
-/* Return the index for variable N */
-int categoricals_index (const struct categoricals *cat, size_t n, const union value *val);
-
 void categoricals_done (struct categoricals *cat);
 
 const struct variable * categoricals_get_variable_by_subscript (const struct categoricals *cat, int subscript);
@@ -66,6 +73,8 @@ double categoricals_get_sum_by_subscript (const struct categoricals *cat, int su
 double categoricals_get_binary_by_subscript (const struct categoricals *cat, int subscript,
 					     const struct ccase *c);
 
+void * categoricals_get_user_data_by_subscript (const struct categoricals *cat, int subscript);
+