X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Fstats%2Fnpar.h;h=af093ffb9993d4711387bc5542ac5a72c5b87d00;hb=96933598f8938a216439e98f6758c8916d85873c;hp=082d396b58f91b1e09bc7e7e5511253ef88ae5a7;hpb=ec7e9edc4433264efc66e6e3d661c198148f87c9;p=pspp diff --git a/src/language/stats/npar.h b/src/language/stats/npar.h index 082d396b58..af093ffb99 100644 --- a/src/language/stats/npar.h +++ b/src/language/stats/npar.h @@ -20,18 +20,16 @@ #include #include #include - -#include -#include +#include typedef const struct variable *variable_pair[2]; -struct hsh_table; -struct const_hsh_table; +struct hmapx; struct casefilter; struct casereader; struct dataset; + struct npar_test { void (*execute) (const struct dataset *, @@ -42,7 +40,7 @@ struct npar_test double); void (*insert_variables) (const struct npar_test *, - struct const_hsh_table *); + struct hmapx *); }; @@ -67,6 +65,7 @@ struct n_sample_test const struct variable **vars; size_t n_vars; + union value val1, val2; const struct variable *indep_var; };