X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fcategoricals.h;h=d9ac1f5efe6c17dfdd347733e453b252c092feea;hb=dc32b2366bbb293a81b57a9a19285188db28c881;hp=2cec0b45cd3822ebbc6d7aff70ec34bf4b7ca530;hpb=d06112af3e59338577515f98ec929454d608db71;p=pspp-builds.git

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index 2cec0b45..d9ac1f5e 100644
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 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
@@ -19,16 +19,28 @@
 #define _CATEGORICALS__
 
 #include <stddef.h>
-#include <data/missing-values.h>
+#include "data/missing-values.h"
 
 struct categoricals;
 struct variable;
 struct ccase;
+struct interaction;
 
 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,
+			  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);
 
 void categoricals_destroy (struct categoricals *);
 
@@ -42,17 +54,45 @@ 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);
+/*
+  Must be called (once) before any call to the *_by_subscript or *_by_category
+  functions, but AFTER any calls to categoricals_update 
+*/
+void categoricals_done (const struct categoricals *cat);
 
-const struct variable * categoricals_get_variable_by_subscript (const struct categoricals *cat, int subscript);
 
-const union value * categoricals_get_value_by_subscript (const struct categoricals *cat, int subscript);
+/*
+  The *_by_subscript functions use the short map.
+  Their intended use is by covariance matrix routines, where normally 1 less than 
+  the total number of distinct values of each categorical variable should
+  be considered.
+ */
+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);
 
 
+/* 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);
+
+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);
+
+
 #endif