projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix assertion for proper Huffman merge pattern: 0 == 1 modulo 1.
[pspp]
/
src
/
group.h
diff --git
a/src/group.h
b/src/group.h
index a195f06a8729b3ea14d94f2160bdd5d31aa0ee2b..954418a872af25dadb99378c227d31e19759afb5 100644
(file)
--- a/
src/group.h
+++ b/
src/group.h
@@
-18,7
+18,6
@@
02111-1307, USA. */
02111-1307, USA. */
-
#ifndef GROUP_H
#define GROUP_H
#ifndef GROUP_H
#define GROUP_H
@@
-26,27
+25,12
@@
#include "val.h"
#include "val.h"
-enum comparison
- {
- CMP_LE = -2,
- CMP_LT = -1,
- CMP_EQ = 0,
- CMP_GT = 1,
- CMP_GE = 2
- };
-
-
/* Statistics for grouped data */
struct group_statistics
{
/* The value of the independent variable for this group */
union value id;
/* Statistics for grouped data */
struct group_statistics
{
/* The value of the independent variable for this group */
union value id;
- /* The criterium matching for comparing with id
- (applicable only to T-TEST) FIXME: therefore it shouldn't be here
- */
- enum comparison criterion;
-
/* The arithmetic mean */
double mean;
/* The arithmetic mean */
double mean;
@@
-90,7
+74,7
@@
struct group_statistics
-/* These funcs are useful
l
for hash tables */
+/* 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 */
/* Return -1 if the id of a is less than b; +1 if greater than and
0 if equal */