X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Fmath%2Fcategoricals.h;h=91767270de599218a6f8eddf46de65952672628f;hb=4010cd95ae15efa542a324c4c2081b19ab10b902;hp=af9226458e0516dbd1016423ac1b071b59d6e54a;hpb=194d01aaac43a41a174037357f89bc164b5c5213;p=pspp

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index af9226458e..91767270de 100644
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -1,16 +1,48 @@
+/* PSPP - a program for statistical analysis.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+
 #ifndef _CATEGORICALS__
 #define _CATEGORICALS__
 
 #include <stddef.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);
+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);
+
+void categoricals_destroy (struct categoricals *);
 
 void categoricals_update (struct categoricals *cat, const struct ccase *c);
 
@@ -18,11 +50,54 @@ 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.
+  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);
+
+
+/*
+  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);
+
+
+/*
+  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);
 
-/* Return the index for variable N */
-int categoricals_index (const struct categoricals *cat, size_t n, const union value *val);
 
 #endif