Merge commit 'origin/stable'

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

diff --git a/src/language/stats/npar-summary.h b/src/language/stats/npar-summary.h
index 1a5125b671ae56b34c0d376ebc3c1dc64c98b3c7..a8b12797c1c8b6667de481a41c5f05644a6a08d7 100644 (file)
--- a/src/language/stats/npar-summary.h
+++ b/src/language/stats/npar-summary.h
@@ -1,30 +1,25 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006 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 !n_par_summary_h
 #define n_par_summary_h 1
 
-#include <config.h>
-
 struct variable ;
-struct casefile ;
+struct casereader ;
 struct dictionary;
-struct casefilter;
 
 struct descriptives
 {
@@ -35,18 +30,16 @@ struct descriptives
   double max;
 };
 
+void
+do_summary_box (const struct descriptives *desc,
+               const struct variable *const *vv,
+               int n_vars);
+
 void npar_summary_calc_descriptives (struct descriptives *desc,
-                                    const struct casefile *cf,
-                                    struct casefilter *filter,
+                                    struct casereader *input,
                                     const struct dictionary *dict,
-                                    const struct variable *const *vv, 
-                                    int n_vars);
-
-
-void do_summary_box (const struct descriptives *desc, 
-                    const struct variable *const *vv,
-                    int n_vars);
-
-
+                                    const struct variable *const *vv,
+                                    int n_vars,
+                                     enum mv_class filter);
 
 #endif