X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffreq.h;h=412a46ac9f232ebce882b1b26ec3b587371edbf3;hb=d98583b9425b8a053dc21b539203406bac74adc5;hp=98af8a6f0483785c375783ed4c4ddea2706ab3d6;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/language/stats/freq.h b/src/language/stats/freq.h
index 98af8a6f04..412a46ac9f 100644
--- a/src/language/stats/freq.h
+++ b/src/language/stats/freq.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2015 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
@@ -14,35 +14,48 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#ifndef freq_h
-#define freq_h
+#ifndef LANGUAGE_STATS_FREQ_H
+#define LANGUAGE_STATS_FREQ_H 1
+
+#include "data/value.h"
+#include "libpspp/hmap.h"
 
-union value ;
 /* Frequency table entry. */
 struct freq
   {
-    const union value *value;	/* The value. */
+    struct hmap_node node;      /* Element in hash table. */
     double count;		/* The number of occurrences of the value. */
+    union value values[1];      /* The value. */
   };
 
-/* Non const version of frequency table entry. */
-struct freq_mutable
-  {
-    union value *value;	        /* The value. */
-    double count;		/* The number of occurrences of the value. */
-  };
+
+struct freq *freq_clone (const struct freq *, int values, int *widths);
+void freq_destroy (struct freq *f, int values, int *widths);
+
+
+static inline size_t
+table_entry_size (size_t n_values)
+{
+  return (offsetof (struct freq, values)
+          + n_values * sizeof (union value));
+}
+
+
+int compare_freq_ptr_3way (const void *a_, const void *b_, const void *width_);
+
 
 
-int compare_freq ( const void *_f1, const void *_f2, const void *_var);
+void freq_hmap_destroy (struct hmap *, int width);
 
-unsigned int hash_freq (const void *_f, const void *_var);
+struct freq *freq_hmap_search (struct hmap *, const union value *, int width,
+                               size_t hash);
+struct freq *freq_hmap_insert (struct hmap *, const union value *, int width,
+                               size_t hash);
 
-/* Free function for struct freq */
-void free_freq_hash (void *fr, const void *aux);
+struct freq **freq_hmap_sort (struct hmap *, int width);
+struct freq *freq_hmap_extract (struct hmap *);
 
-/* Free function for struct freq_mutable */
-void free_freq_mutable_hash (void *fr, const void *var);
 
 
 
-#endif
+#endif /* language/stats/freq.h */