X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.h;h=c5919bc455e883e131bb2aa637b1165d0bf36ea2;hb=52d795d2fe3611efc1d51b2cdf6851bb7e67682e;hp=ec708efa178c91a3c8b621264a1fc3d05dffd3e8;hpb=2414a9e37882fd23d9e50f916bb9e6a7cc2f6bad;p=pspp

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index ec708efa17..c5919bc455 100644
--- 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,9 @@ 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 (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);
+struct categoricals *categoricals_create (struct interaction *const*, size_t n_int,
+					  const struct variable *wv, enum mv_class dep_excl,
+					  enum mv_class fctr_excl);
 
 void categoricals_destroy (struct categoricals *);
 
@@ -67,13 +57,19 @@ size_t categoricals_df_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_sane (const struct categoricals *cat);
+
 
 /*
   The *_by_subscript functions use the short map.
@@ -86,17 +82,47 @@ const struct interaction *categoricals_get_interaction_by_subscript (const struc
 
 double categoricals_get_sum_by_subscript (const struct categoricals *cat, int subscript);
 
-double categoricals_get_code_for_case (const struct categoricals *cat, int subscript, const struct ccase *c);
+/* Returns unity if the value in case C at SUBSCRIPT is equal to the category
+   for that subscript */
+double
+categoricals_get_dummy_code_for_case (const struct categoricals *cat, int subscript,
+				     const struct ccase *c);
+
+/* Returns unity if the value in case C at SUBSCRIPT is equal to the category
+   for that subscript. 
+   Else if it is the last category, return -1.
+   Otherwise return 0.
+ */
+double
+categoricals_get_effects_code_for_case (const struct categoricals *cat, int subscript,
+					const struct ccase *c);
 
 
 /* These use the long map.  Useful for descriptive statistics. */
 
-/* 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 (*calculate) (const void *aux1, void *aux2, void *user_data);
+  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