diff options
| author | Kenneth Heafield <github@kheafield.com> | 2014-06-02 21:28:02 +0400 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2014-06-02 21:29:40 +0400 |
| commit | dd03f9fb69da82a37f1846d25dcc8d8781956e96 (patch) | |
| tree | 12df06240d6149f110982d1f76c9addf40acbce1 /util/probing_hash_table.hh | |
| parent | 31a583b0bc322626356a42965f02534249070525 (diff) | |
KenLM 5a7efd8fe1db88ee0a9f7e9479b24ac3ca348221 with Hieu's patch to exception.hh
Diffstat (limited to 'util/probing_hash_table.hh')
| -rw-r--r-- | util/probing_hash_table.hh | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/util/probing_hash_table.hh b/util/probing_hash_table.hh index 38524806c..ea228dd9a 100644 --- a/util/probing_hash_table.hh +++ b/util/probing_hash_table.hh @@ -1,5 +1,5 @@ -#ifndef UTIL_PROBING_HASH_TABLE__ -#define UTIL_PROBING_HASH_TABLE__ +#ifndef UTIL_PROBING_HASH_TABLE_H +#define UTIL_PROBING_HASH_TABLE_H #include "util/exception.hh" #include "util/scoped.hh" @@ -258,6 +258,10 @@ template <class EntryT, class HashT, class EqualT = std::equal_to<typename Entry private: typedef ProbingHashTable<EntryT, HashT, EqualT> Backend; public: + static std::size_t MemUsage(std::size_t size, float multiplier = 1.5) { + return Backend::Size(size, multiplier); + } + typedef EntryT Entry; typedef typename Entry::Key Key; typedef const Entry *ConstIterator; @@ -268,6 +272,7 @@ template <class EntryT, class HashT, class EqualT = std::equal_to<typename Entry AutoProbing(std::size_t initial_size = 10, const Key &invalid = Key(), const Hash &hash_func = Hash(), const Equal &equal_func = Equal()) : allocated_(Backend::Size(initial_size, 1.5)), mem_(util::MallocOrThrow(allocated_)), backend_(mem_.get(), allocated_, invalid, hash_func, equal_func) { threshold_ = initial_size * 1.2; + Clear(); } // Assumes that the key is unique. Multiple insertions won't cause a failure, just inconsistent lookup. @@ -323,4 +328,4 @@ template <class EntryT, class HashT, class EqualT = std::equal_to<typename Entry } // namespace util -#endif // UTIL_PROBING_HASH_TABLE__ +#endif // UTIL_PROBING_HASH_TABLE_H |