X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.h;h=09ced7d7acc2a9900fd67039697b98273aaafe0c;hb=3da49359c52cb783db907cc197847bbd5e721c97;hp=619135a3393ef05afd213d480ee6c9c38f5a21e2;hpb=fc4133a6cd4b508fd61571a71cb19ccaea65a7f8;p=pspp

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index 619135a339..09ced7d7ac 100644
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -19,6 +19,7 @@
 #define _CATEGORICALS__
 
 #include <stddef.h>
+#include <data/missing-values.h>
 
 struct categoricals;
 struct variable;
@@ -26,8 +27,19 @@ struct ccase;
 
 union value ;
 
-struct categoricals *categoricals_create (const struct variable **v, size_t n_vars,
-					  const struct variable *wv);
+typedef void update_func (void *user_data,
+			  enum mv_class exclude,
+			  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 *);
 
@@ -41,8 +53,13 @@ size_t categoricals_n_count (const struct categoricals *cat, size_t n);
 /* 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);
 
@@ -50,8 +67,17 @@ const struct variable * categoricals_get_variable_by_subscript (const struct 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);
 
+void * categoricals_get_user_data_by_subscript (const struct categoricals *cat, int subscript);
+
+
+
+
 
 #endif