projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intern: Use UP_CAST macro instad of open-coding it.
[pspp]
/
src
/
language
/
stats
/
npar.h
diff --git
a/src/language/stats/npar.h
b/src/language/stats/npar.h
index 37939fe9172b496eaeca10210c7c94fb85969c37..367cf65d3bb2a07ac6a97f3e9646120d11ed7171 100644
(file)
--- a/
src/language/stats/npar.h
+++ b/
src/language/stats/npar.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
, 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
@@
-18,31
+18,32
@@
#define npar_h 1
#include <stddef.h>
#define npar_h 1
#include <stddef.h>
-#include <data/missing-values.h>
-
-#include <stddef.h>
-#include <data/missing-values.h>
+#include <stdbool.h>
+#include "data/missing-values.h"
+#include "data/value.h"
typedef const struct variable *variable_pair[2];
typedef const struct variable *variable_pair[2];
-struct hsh_table;
-struct const_hsh_table;
+struct hmapx;
struct casefilter;
struct casereader;
struct dataset;
struct casefilter;
struct casereader;
struct dataset;
+
struct npar_test
{
void (*execute) (const struct dataset *,
struct casereader *,
enum mv_class exclude,
struct npar_test
{
void (*execute) (const struct dataset *,
struct casereader *,
enum mv_class exclude,
- const struct npar_test *
- );
+ const struct npar_test *,
+ bool,
+ double);
void (*insert_variables) (const struct npar_test *,
void (*insert_variables) (const struct npar_test *,
- struct
const_hsh_table
*);
+ struct
hmapx
*);
};
};
+
struct one_sample_test
{
struct npar_test parent;
struct one_sample_test
{
struct npar_test parent;
@@
-58,4
+59,14
@@
struct two_sample_test
};
};
+struct n_sample_test
+{
+ struct npar_test parent;
+ const struct variable **vars;
+ size_t n_vars;
+
+ union value val1, val2;
+ const struct variable *indep_var;
+};
+
#endif
#endif