Update all #include directives to the currently preferred style.

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

diff --git a/src/language/stats/npar.h b/src/language/stats/npar.h
index 3907bb26716993de67e369d6aaf837b6d3dc3aaa..367cf65d3bb2a07ac6a97f3e9646120d11ed7171 100644 (file)
--- a/src/language/stats/npar.h
+++ b/src/language/stats/npar.h
@@ -1,43 +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 <http://www.gnu.org/licenses/>. */
 
 #if !npar_h
 #define npar_h 1
 
-typedef const struct variable *var_ptr;
-typedef var_ptr variable_pair[2];
+#include <stddef.h>
+#include <stdbool.h>
+#include "data/missing-values.h"
+#include "data/value.h"
+
+typedef const struct variable *variable_pair[2];
+
+struct hmapx;
+struct casefilter;
+struct casereader;
+struct dataset;
 
-struct hsh_table;
-struct const_hsh_table;
-struct casefilter ;
 
 struct npar_test
 {
-  void (*execute) (const struct dataset *, 
-                  const struct casefile *, 
-                  struct casefilter *,
-                  const struct npar_test *
-                  );
-
-  void (*insert_variables) (const struct npar_test *, 
-                           struct const_hsh_table *);
+  void (*execute) (const struct dataset *,
+                  struct casereader *,
+                   enum mv_class exclude,
+                  const struct npar_test *,
+                  bool,
+                  double);
+
+  void (*insert_variables) (const struct npar_test *,
+                           struct hmapx *);
 };
 
+
 struct one_sample_test
 {
   struct npar_test parent;
@@ -53,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