projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a base parameter to the interaction_case_hash function
[pspp-builds.git]
/
src
/
math
/
categoricals.h
diff --git
a/src/math/categoricals.h
b/src/math/categoricals.h
index 2cd55b5ec3afa1a6d8630d754bf682518c817c56..91767270de599218a6f8eddf46de65952672628f 100644
(file)
--- a/
src/math/categoricals.h
+++ b/
src/math/categoricals.h
@@
-37,7
+37,7
@@
typedef void update_func (void *user_data,
typedef void *user_data_create_func (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,
+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);
const struct variable *wv, enum mv_class exclude,
user_data_create_func *udf,
update_func *update, void *aux1, void *aux2);
@@
-50,9
+50,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);
/* 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 */
/* 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.
/*
Return the total number of variables which participated in these categoricals.
@@
-76,9
+81,8
@@
void categoricals_done (const struct categoricals *cat);
the total number of distinct values of each categorical variable should
be considered.
*/
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);
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_sum_by_subscript (const struct categoricals *cat, int subscript);