Merge commit 'origin/stable'

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

diff --git a/src/language/stats/chisquare.h b/src/language/stats/chisquare.h
index 4310bb10ec7496eeebc8c20b12f18ba5c607f2ed..91a17d1a14fc23e89e5d0cd2984b8888d6eba51b 100644 (file)
--- a/src/language/stats/chisquare.h
+++ b/src/language/stats/chisquare.h
@@ -1,55 +1,54 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
 
-   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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #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;  
+  struct one_sample_test parent;
 
   bool ranged ;     /* True if this test has a range specified */
 
   int lo;           /* Lower bound of range (undefined if RANGED is false) */
   int hi;           /* Upper bound of range (undefined if RANGED is false) */
 
-  double *expected; 
+  double *expected;
   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,
-                       const struct npar_test *test);
+void chisquare_execute (const struct dataset *ds,
+                       struct casereader *input,
+                        enum mv_class exclude,
+                       const struct npar_test *test,
+                       bool,
+                       double);