Changeset 2080

Timestamp:

05/08/12 12:05:50 (13 months ago)

Author:

ksherdy

Message:

Add.

Files:

• trunk/symbol_table/src/hash_table.hpp (modified) (7 diffs)

trunk/symbol_table/src/hash_table.hpp

@@ -46 +46 @@
 } node;
 
-template<uint32_t LGTH, class COMPARE_STRATEGY, class HASH_STRATEGY, class ALLOCATOR>
+template<uint32_t LGTH, int GROUP_STRATEGY, class ALLOCATOR>
 class hash_table {
 
 public:
-
     hash_table(const uint32_t table_size=1024, const uint32_t resize_chain_lgth=2) {
         #ifdef HASH_TABLE_HPP_DEBUG
@@ -276 +275 @@
     node ** table;
     byte_pool<ALLOCATOR> raw_data_pool;
-    COMPARE_STRATEGY compare_strategy;
-    HASH_STRATEGY hash_strategy;
+    compare_strategy_t<LGTH> compare_strategy;
+    hash_strategy_t<LGTH,GROUP_STRATEGY> hash_strategy;
 
     ///////////////////////////////////////////////////////////////////////////
@@ -354 +353 @@
 // id - Identity Strategy
 ///////////////////////////////////////////////////////////////////////////
-template<uint32_t LGTH, class COMPARE_STRATEGY, class HASH_STRATEGY, class ALLOCATOR>
-class id_hash_table : public hash_table<LGTH, COMPARE_STRATEGY, HASH_STRATEGY, ALLOCATOR> {};
+template<uint32_t LGTH, int GROUP_STRATEGY, class ALLOCATOR>
+class id_hash_table : public hash_table<LGTH, GROUP_STRATEGY, ALLOCATOR> {};
 
 ///////////////////////////////////////////////////////////////////////////
@@ -375 +374 @@
 }
 
-
-template<uint32_t LGTH, class COMPARE_STRATEGY, class HASH_STRATEGY, class ALLOCATOR>
-class div2_hash_table : public hash_table<LGTH, COMPARE_STRATEGY, HASH_STRATEGY, ALLOCATOR> {
+template<uint32_t LGTH, int GROUP_STRATEGY, class ALLOCATOR>
+class div2_hash_table : public hash_table<LGTH, GROUP_STRATEGY, ALLOCATOR> {
 
 public:
@@ -425 +423 @@
                 // Odd
                 ///////////////////////////////////////////////////////////////////////////
-                if(this->hash_table_odd.lookup(bucket, raw_bytes, idx, lgth-1, h0, h1, gid)) {
+                bucket = this->hash_table_odd.get_bucket(h0,h1,idx);
+                lgth = lgth - 1;
+
+                if(this->hash_table_odd.lookup(bucket, raw_bytes, idx, lgth, h0, h1, gid)) {
                     return gid;
                 }
 
-                hash_table_odd.pool_and_insert(bucket, raw_bytes, idx, lgth-1, h0, h1, gid_factory, gid_data, gid);
+                hash_table_odd.pool_and_insert(bucket, raw_bytes, idx, lgth, h0, h1, gid_factory, gid_data, gid);
                 return gid;
             }
@@ -441 +442 @@
     }
 
-    id_hash_table<LGTH-1, COMPARE_STRATEGY, HASH_STRATEGY, ALLOCATOR> hash_table_odd;
+    id_hash_table<LGTH-1, id, ALLOCATOR> hash_table_odd;
 };
 
@@ -447 +448 @@
 // log2 - Log base 2 Strategy
 ///////////////////////////////////////////////////////////////////////////
-template<uint32_t LGTH, class COMPARE_STRATEGY, class HASH_STRATEGY, class ALLOCATOR>
-class log2_hash_table : public hash_table<LGTH, COMPARE_STRATEGY, HASH_STRATEGY, ALLOCATOR> {};
+template<uint32_t LGTH, int GROUP_STRATEGY, class ALLOCATOR>
+class logbase2_hash_table : public hash_table<LGTH, GROUP_STRATEGY, ALLOCATOR> {};
 
 #endif // HASH_TABLE_HPP