Actually implement the new procedure code and adapt all of its clients

[pspp-builds.git] / src / language / stats / chisquare.h

diff --git a/src/language/stats/chisquare.h b/src/language/stats/chisquare.h
index 71a3c1745c88f3caee111a406315c1aa0bf49ce8..d9d34abdce38e1030cd143246554fb1c3e4a34a3 100644 (file)
--- a/src/language/stats/chisquare.h
+++ b/src/language/stats/chisquare.h
@@ -19,11 +19,10 @@
 #if !chisquare_h
 #define chisquare_h 1
 
-#include <config.h>
 #include <stddef.h>
 #include <stdbool.h>
+#include <language/stats/npar.h>
 
-#include "npar.h"
 struct chisquare_test
 {
   struct one_sample_test parent;  
@@ -37,17 +36,18 @@ struct chisquare_test
   int n_expected;
 };
 
-struct casefile;
-struct dictionary ;
+struct casereader;
+struct dictionary;
 struct hsh_table;
+struct dataset;
 
 void chisquare_insert_variables (const struct npar_test *test,
                                 struct hsh_table *variables);
 
 
 void chisquare_execute (const struct dataset *ds, 
-                       const struct casefile *cf, 
-                       struct casefilter *filter,
+                       struct casereader *input,
+                        enum mv_class exclude,
                        const struct npar_test *test);