X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmath%2Fgroup.h;h=1e0b26724d0d2dc559966deb6b94c7984f7b7a3c;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=9c2f84fe6de132ac9c75ecc3aacdba70a9d869b7;hpb=164d1274fcb70c54897f2a03fc7c27152ed4821a;p=pspp-builds.git
diff --git a/src/math/group.h b/src/math/group.h
index 9c2f84fe..1e0b2672 100644
--- a/src/math/group.h
+++ b/src/math/group.h
@@ -1,28 +1,24 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2004 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2004, 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 . */
#ifndef GROUP_H
#define GROUP_H
-
-#include
-
+#include "data/value.h"
/* Statistics for grouped data */
struct group_statistics
@@ -38,7 +34,7 @@ struct group_statistics
/* Sample std. deviation */
double s_std_dev;
-
+
/* count */
double n;
@@ -58,33 +54,19 @@ 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
- 0 if equal */
-int compare_group(const struct group_statistics *a,
- const struct group_statistics *b,
- int width);
-
-unsigned hash_group(const struct group_statistics *g, int width);
-
-void free_group(struct group_statistics *v, void *aux);
-
-
+void free_group (struct group_statistics *v, void *aux);
#endif