X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Ffreq.h;fp=src%2Flanguage%2Fstats%2Ffreq.h;h=412a46ac9f232ebce882b1b26ec3b587371edbf3;hb=97fb55e07cac602cbca57ce8005de5c8a67a73cc;hp=fd6081f4e13c465704ce2bf264b6a14d6daf9ebb;hpb=6e44fb76d15ebc34122753b8a7a7d4a1b82bcb43;p=pspp diff --git a/src/language/stats/freq.h b/src/language/stats/freq.h index fd6081f4e1..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, 2010 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 @@ -23,11 +23,28 @@ /* Frequency table entry. */ struct freq { - struct hmap_node hmap_node; /* Element in hash table. */ - 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. */ }; + +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_); + + + void freq_hmap_destroy (struct hmap *, int width); struct freq *freq_hmap_search (struct hmap *, const union value *, int width, @@ -38,4 +55,7 @@ struct freq *freq_hmap_insert (struct hmap *, const union value *, int width, struct freq **freq_hmap_sort (struct hmap *, int width); struct freq *freq_hmap_extract (struct hmap *); + + + #endif /* language/stats/freq.h */