projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #11227 (T-Test not working with alpha independent variable )
[pspp-builds.git]
/
src
/
factor_stats.h
diff --git
a/src/factor_stats.h
b/src/factor_stats.h
index c193f883e47384008781b39bd41333f0969990c5..d29ca4d80a39ae530d6de7415ad70a38d18fb3c1 100644
(file)
--- a/
src/factor_stats.h
+++ b/
src/factor_stats.h
@@
-27,6
+27,9
@@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include "hash.h"
#include "val.h"
#include "hash.h"
#include "val.h"
+#include <gsl/gsl_histogram.h>
+
+struct moments1;
struct metrics
{
struct metrics
{
@@
-34,22
+37,25
@@
struct metrics
double n_missing;
double n_missing;
- double ssq;
-
- double sum;
-
double min;
double max;
double mean;
double min;
double max;
double mean;
- double s
tderr
;
+ double s
e_mean
;
double var;
double stddev;
double var;
double stddev;
+ struct moments1 *moments;
+
+ gsl_histogram *histogram;
+
+ double skewness;
+ double kurtosis;
+
double trimmed_mean;
/* A hash of data for this factor.
double trimmed_mean;
/* A hash of data for this factor.
@@
-111,7
+117,7
@@
void weighted_value_free(struct weighted_value *wv);
struct factor_statistics {
struct factor_statistics {
- /* The value
of the independent variable
*/
+ /* The value
s of the independent variables
*/
union value id[2];
/* The an array stats for this factor, one for each dependent var */
union value id[2];
/* The an array stats for this factor, one for each dependent var */
@@
-129,18
+135,15
@@
create_factor_statistics (int n, union value *id0, union value *id1);
void factor_statistics_free(struct factor_statistics *f);
void factor_statistics_free(struct factor_statistics *f);
+/* Compare f0 and f1.
+ width is the width of the independent variable */
int
factor_statistics_compare(const struct factor_statistics *f0,
int
factor_statistics_compare(const struct factor_statistics *f0,
- const struct factor_statistics *f1,
void *aux
);
+ const struct factor_statistics *f1,
int width
);
unsigned int
unsigned int
-factor_statistics_hash(const struct factor_statistics *f, void *aux);
-
-
-
-
-
+factor_statistics_hash(const struct factor_statistics *f, int width);
#endif
#endif