motiejus/turbonss
1
Fork 0
Code Releases Activity

Thinking slack.

Browse Source
This commit is contained in:
davi 2010-11-06 09:14:07 -02:00
parent 0c5f2301df
commit 7c9c6c518d
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cxxmph/cmph_hash_map.h
View File

@ -67,11 +67,20 @@ class cmph_hash_map {
return iterator_first<iterator>(it); return iterator_first<iterator>(it);
} }
struct slack_hashfnc {
size_t operator()(const const_iterator& it) const { return HashFcn()(it->first); }
};
struct slack_equalkey {
bool operator()(const const_iterator& lhs, const const_iterator& rhs) {
return EqualKey()(lhs->first, rhs->first);
}
};
void rehash(); void rehash();
std::vector<value_type> values_; std::vector<value_type> values_;
SimpleMPHTable<Key, typename OptimizedSeededHashFunction<HashFcn>::hash_function> table_; SimpleMPHTable<Key, typename OptimizedSeededHashFunction<HashFcn>::hash_function> table_;
typedef typename __gnu_cxx::hash_map<Key, Data, HashFcn, EqualKey, Alloc> slack_type; typedef typename __gnu_cxx::hash_set<const_iterator, slack_hashfnc, slack_equalkey, Alloc> slack_type;
slack_type slack_; slack_type slack_;
}; };
@ -91,7 +100,7 @@ CMPH_METHOD_DECL(insert_return_type, insert)(const value_type& x) {
iterator it = find(x.first); iterator it = find(x.first);
if (it != end()) return std::make_pair(it, false); if (it != end()) return std::make_pair(it, false);
values_.push_back(x); values_.push_back(x);
slack_.insert(std::make_pair(x.first, values_.size() - 1)); slack_.insert(values_.end() - 1);
if ((slack_.size() > 10 && table_.size() == 0) || if ((slack_.size() > 10 && table_.size() == 0) ||
(table_.size() && slack_.size() > table_.size() * 2)) { (table_.size() && slack_.size() > table_.size() * 2)) {
rehash(); rehash();
@ -106,9 +115,10 @@ CMPH_METHOD_DECL(void_type, rehash)() {
table_.Reset(make_iterator_first(values_.begin()), table_.Reset(make_iterator_first(values_.begin()),
make_iterator_first(values_.end())); make_iterator_first(values_.end()));
std::vector<value_type> new_values(values_.size()); std::vector<value_type> new_values(values_.size());
for (unsigned int i = 0; i < values_.size(); ++i) { for (const_iterator it = values_.begin(), end = values_.end();
size_type id = table_.index(values_[i].first); it != end; ++it) {
new_values[id] = values_[i]; size_type id = table_.index(it->first);
new_values[id] = *it;
} }
values_.swap(new_values); values_.swap(new_values);
} }
@ -137,8 +147,10 @@ CMPH_METHOD_DECL(void_type, erase)(const key_type& k) {
CMPH_METHOD_DECL(const_iterator, find)(const key_type& k) const { CMPH_METHOD_DECL(const_iterator, find)(const key_type& k) const {
if (!slack_.empty()) { if (!slack_.empty()) {
typename slack_type::const_iterator it = slack_.find(k); iterator slack_key;
if (it != slack_.end()) return values_.begin() + it->second; slack_key.first = k;
typename slack_type::const_iterator it = slack_.find(slack_key);
if (it != slack_.end()) return *it;
} }
if (table_.size() == 0) return end(); if (table_.size() == 0) return end();
size_type id = table_.index(k); size_type id = table_.index(k);