motiejus/turbonss
1
Fork 0
Code Releases Activity

Disabled cuckoo stuff to beat STL again.

Browse Source
This commit is contained in:
Davi Reis 2012-03-14 12:07:08 -03:00
parent 687cc1b194
commit 9c4bb27dc4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cxxmph/mph_map.h
View File

@ -236,6 +236,8 @@ MPH_MAP_METHOD_DECL(void_type, erase)(const key_type& k) {
} }
MPH_MAP_METHOD_DECL(const_iterator, find)(const key_type& k) const { MPH_MAP_METHOD_DECL(const_iterator, find)(const key_type& k) const {
return slow_find(k, index_.perfect_hash(k));
/*
uint32_t h[4]; uint32_t h[4];
index_.hash_vector(k, h); index_.hash_vector(k, h);
auto nest = get_nest_value(h); auto nest = get_nest_value(h);
@ -246,6 +248,7 @@ MPH_MAP_METHOD_DECL(const_iterator, find)(const key_type& k) const {
nest = index_.cuckoo_nest(h); nest = index_.cuckoo_nest(h);
assert(index_.perfect_hash(k) == index_.cuckoo_hash(h, nest)); assert(index_.perfect_hash(k) == index_.cuckoo_hash(h, nest));
return slow_find(k, index_.cuckoo_hash(h, nest)); return slow_find(k, index_.cuckoo_hash(h, nest));
*/
} }
MPH_MAP_METHOD_DECL(const_iterator, slow_find)(const key_type& k, uint32_t perfect_hash) const { MPH_MAP_METHOD_DECL(const_iterator, slow_find)(const key_type& k, uint32_t perfect_hash) const {
@ -263,6 +266,8 @@ MPH_MAP_METHOD_DECL(const_iterator, slow_find)(const key_type& k, uint32_t perfe
} }
MPH_MAP_METHOD_DECL(iterator, find)(const key_type& k) { MPH_MAP_METHOD_DECL(iterator, find)(const key_type& k) {
return slow_find(k, index_.perfect_hash(k));
/*
uint32_t h[4]; uint32_t h[4];
index_.hash_vector(k, h); index_.hash_vector(k, h);
auto nest = get_nest_value(h); auto nest = get_nest_value(h);
@ -273,6 +278,7 @@ MPH_MAP_METHOD_DECL(iterator, find)(const key_type& k) {
nest = index_.cuckoo_nest(h); nest = index_.cuckoo_nest(h);
// assert(index_.perfect_hash(k) == index_.cuckoo_hash(h, nest)); // assert(index_.perfect_hash(k) == index_.cuckoo_hash(h, nest));
return slow_find(k, index_.cuckoo_hash(h, nest)); return slow_find(k, index_.cuckoo_hash(h, nest));
*/
} }
MPH_MAP_METHOD_DECL(iterator, slow_find)(const key_type& k, uint32_t perfect_hash) { MPH_MAP_METHOD_DECL(iterator, slow_find)(const key_type& k, uint32_t perfect_hash) {