Merge commit 'origin/stable'

[pspp-builds.git] / src / math / group.h

diff --git a/src/math/group.h b/src/math/group.h
index 3fa7c862181d734ee60563aada65f96ccdc92c15..c5470b2578f2a1948e66a1ca6e6ae220d1616ecb 100644 (file)
--- a/src/math/group.h
+++ b/src/math/group.h
@@ -1,30 +1,25 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2004 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/>. */
 
 
 #ifndef GROUP_H
 #define GROUP_H
 
-
 #include <data/value.h>
 
-
 /* Statistics for grouped data */
 struct group_statistics
   {
@@ -39,7 +34,7 @@ struct group_statistics
 
     /* Sample std. deviation */
     double s_std_dev;
-    
+
     /* count */
     double n;
 
@@ -59,32 +54,30 @@ struct group_statistics
 
     /* Running total of the Levene for this group */
     double lz_total;
-    
+
     /* Group mean of Levene */
-    double lz_mean; 
+    double lz_mean;
 
 
     /* min and max values */
-    double minimum ; 
+    double minimum ;
     double maximum ;
-
-
   };
 
 
-
+struct variable ;
 
 /* These funcs are useful for hash tables */
 
-/* Return -1 if the id of a is less than b; +1 if greater than and 
+/* Return -1 if the id of a is less than b; +1 if greater than and
    0 if equal */
-int  compare_group(const struct group_statistics *a, 
-                  const struct group_statistics *b, 
-                  int width);
+int  compare_group (const void *a,
+                   const void *b,
+                   const void *var);
 
-unsigned hash_group(const struct group_statistics *g, int width);
+unsigned int hash_group (const void *g, const void *var);
 
-void  free_group(struct group_statistics *v, void *aux);
+void  free_group (struct group_statistics *v, void *aux);