X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fchisquare.h;h=da9329c0016e9a7730abe3dc3a317a05b6336a4b;hb=refs%2Fbuilds%2F20130102032118%2Fpspp;hp=71a3c1745c88f3caee111a406315c1aa0bf49ce8;hpb=d7d263511bd18042408c40d5536c20c59988ee15;p=pspp
diff --git a/src/language/stats/chisquare.h b/src/language/stats/chisquare.h
index 71a3c1745c..da9329c001 100644
--- a/src/language/stats/chisquare.h
+++ b/src/language/stats/chisquare.h
@@ -1,54 +1,49 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ 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 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 . */
#if !chisquare_h
#define chisquare_h 1
-#include
#include
#include
+#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 hsh_table;
+struct casereader;
+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);