projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all #include directives to the currently preferred style.
[pspp-builds.git]
/
src
/
math
/
categoricals.h
diff --git
a/src/math/categoricals.h
b/src/math/categoricals.h
index 67be020463961175351f5e7d25b057e839256070..97cde65e74dda7f856674bb253eda6748d3ccb24 100644
(file)
--- a/
src/math/categoricals.h
+++ b/
src/math/categoricals.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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,7
+19,7
@@
#define _CATEGORICALS__
#include <stddef.h>
#define _CATEGORICALS__
#include <stddef.h>
-#include
<data/missing-values.h>
+#include
"data/missing-values.h"
struct categoricals;
struct variable;
struct categoricals;
struct variable;
@@
-27,8
+27,19
@@
struct ccase;
union value ;
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 variable *const *v, size_t n_vars,
struct categoricals *categoricals_create (const struct variable *const *v, size_t n_vars,
- const struct variable *wv, enum mv_class exclude);
+ 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_destroy (struct categoricals *);
@@
-50,7
+61,7
@@
size_t categoricals_total (const struct categoricals *cat);
*/
size_t categoricals_get_n_variables (const struct categoricals *cat);
*/
size_t categoricals_get_n_variables (const struct categoricals *cat);
-void categoricals_done (struct categoricals *cat);
+void categoricals_done (
const
struct categoricals *cat);
const struct variable * categoricals_get_variable_by_subscript (const struct categoricals *cat, int subscript);
const struct variable * categoricals_get_variable_by_subscript (const struct categoricals *cat, int subscript);
@@
-63,6
+74,8
@@
double categoricals_get_sum_by_subscript (const struct categoricals *cat, int su
double categoricals_get_binary_by_subscript (const struct categoricals *cat, int subscript,
const struct ccase *c);
double categoricals_get_binary_by_subscript (const struct categoricals *cat, int subscript,
const struct ccase *c);
+void * categoricals_get_user_data_by_subscript (const struct categoricals *cat, int subscript);
+