Fix warnings

[pspp-builds.git] / src / math / categoricals.h

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index 6ab451d73949ebcc723df4f577b99749b6e97476..c221cd5694fcc81867f28ebcbd041fbe5ab0cc7d 100644 (file)
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -1,5 +1,5 @@
 /* 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
@@ -28,19 +28,8 @@ struct interaction;
 
 union value ;
 
-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 interaction **, size_t n_int,
-                                         const struct variable *wv, enum mv_class exclude,
-                                         user_data_create_func *udf,
-                                         update_func *update, void *aux1, void *aux2);
+struct categoricals *categoricals_create (struct interaction *const *, size_t n_int,
+                                         const struct variable *wv, enum mv_class exclude);
 
 void categoricals_destroy (struct categoricals *);
 
@@ -50,9 +39,14 @@ void categoricals_update (struct categoricals *cat, const struct ccase *c);
 /* 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.
@@ -63,11 +57,16 @@ size_t categoricals_total (const struct categoricals *cat);
 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);
 
 
 /*
@@ -76,14 +75,12 @@ void 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. */
@@ -91,8 +88,27 @@ double categoricals_get_binary_by_subscript (const struct categoricals *cat, int
 /* Return the value corresponding to the N'th category */
 const union value * categoricals_get_value_by_category (const struct categoricals *cat, int n);
 
+const struct ccase *
+categoricals_get_case_by_category_real (const struct categoricals *cat, int iact, int n);
+
+void *
+categoricals_get_user_data_by_category_real (const struct categoricals *cat, int iact, int n);
+
+
 void * categoricals_get_user_data_by_category (const struct categoricals *cat, int category);
 
+const struct ccase * categoricals_get_case_by_category (const struct categoricals *cat, int subscript);
+
+
+struct payload
+{
+  void* (*create)  (const void *aux1, void *aux2);
+  void (*update)  (const void *aux1, void *aux2, void *user_data, const struct ccase *, double weight);
+  void (*destroy) (const void *aux1, void *aux2, void *user_data);
+};
+
+
+void  categoricals_set_payload (struct categoricals *cats, const struct payload *p, const void *aux1, void *aux2);
 
 
 #endif