fix bug

[c11tester.git] / hashtable.h

diff --git a/hashtable.h b/hashtable.h
index ee7dc19f932fcd08f8ba9b8b7f66a835ecd515f1..b544988ebb187d7ea015940025dce76e573d5a9b 100644 (file)
--- a/hashtable.h
+++ b/hashtable.h
@@ -11,31 +11,52 @@ template<typename _Key, typename _Val>
                struct hashlistnode<_Key,_Val> *next;
        };
 
-template<typename _Key, typename _Val, int _Shift>
+template<typename _Key, typename _Val, typename _KeyInt, int _Shift>
        class HashTable {
  public:
-       HashTable(unsigned int initialcapacity, double factor) {
+       HashTable(unsigned int initialcapacity=1024, double factor=0.5) {
                // Allocate space for the hash table
-               table = calloc(initialcapacity, sizeof(struct hashlistnode<_Key,_Val> *));
+               table = (struct hashlistnode<_Key,_Val> **) calloc(initialcapacity, sizeof(struct hashlistnode<_Key,_Val> *));
                loadfactor = factor;
                capacity = initialcapacity;
-               threshold = initialcapacity*loadfactor;
+               threshold = (unsigned int) (initialcapacity*loadfactor);
                mask = (capacity << _Shift)-1;
                size = 0; // Initial number of elements in the hash
        }
 
        ~HashTable() {
+               for(unsigned int i=0;i<capacity;i++) {
+                       struct hashlistnode<_Key,_Val> * bin = table[i];
+                       while(bin!=NULL) {
+                               struct hashlistnode<_Key,_Val> * next=bin->next;
+                               free(bin);
+                               bin=next;
+                       }
+               }
                free(table);
        }
+
+       void reset() {
+               for(int i=0;i<capacity;i++) {
+                       struct hashlistnode<_Key,_Val> * bin = table[i];
+                       while(bin!=NULL) {
+                               struct hashlistnode<_Key,_Val> * next=bin->next;
+                               free(bin);
+                               bin=next;
+                       }
+               }
+               memset(table, 0, capacity*sizeof(struct hashlistnode<_Key, _Val> *));
+               size=0;
+       }
        
-       void insert(_Key key, _Val val) {
+       void put(_Key key, _Val val) {
                if(size > threshold) {
                        //Resize
                        unsigned int newsize = capacity << 1;
                        resize(newsize);
                }
                
-               struct hashlistnode<_Key,_Val> *ptr = table[(key & mask)>>_Shift];
+               struct hashlistnode<_Key,_Val> *ptr = table[(((_KeyInt)key) & mask)>>_Shift];
                size++;
                struct hashlistnode<_Key,_Val> *search = ptr;
 
@@ -47,15 +68,15 @@ template<typename _Key, typename _Val, int _Shift>
                        search=search->next;
                }
 
-               struct hashlistnode<_Key,_Val> *newptr=malloc(sizeof(struct hashlistnode<_Key,_Val>));
+               struct hashlistnode<_Key,_Val> *newptr=(struct hashlistnode<_Key,_Val> *)malloc(sizeof(struct hashlistnode<_Key,_Val>));
                newptr->key=key;
                newptr->val=val;
                newptr->next=ptr;
-               table[(key&mask)>>_Shift]=newptr;
+               table[(((_KeyInt)key)&mask)>>_Shift]=newptr;
        }
 
        _Val get(_Key key) {
-               struct hashlistnode<_Key,_Val> *search = table[(key & mask)>>_Shift];
+               struct hashlistnode<_Key,_Val> *search = table[(((_KeyInt)key) & mask)>>_Shift];
                
                while(search!=NULL) {
                        if (search->key==key) {
@@ -65,20 +86,32 @@ template<typename _Key, typename _Val, int _Shift>
                }
                return (_Val)0;
        }
+
+       bool contains(_Key key) {
+               struct hashlistnode<_Key,_Val> *search = table[(((_KeyInt)key) & mask)>>_Shift];
+               
+               while(search!=NULL) {
+                       if (search->key==key) {
+                               return true;
+                       }
+                       search=search->next;
+               }
+               return false;
+       }
        
        void resize(unsigned int newsize) {
                struct hashlistnode<_Key,_Val> ** oldtable = table;
                struct hashlistnode<_Key,_Val> ** newtable;
                unsigned int oldcapacity = capacity;
                
-               if((newtable = calloc(newsize, sizeof(struct hashlistnode<_Key,_Val> *))) == NULL) {
+               if((newtable = (struct hashlistnode<_Key,_Val> **) calloc(newsize, sizeof(struct hashlistnode<_Key,_Val> *))) == NULL) {
                        printf("Calloc error %s %d\n", __FILE__, __LINE__);
                        exit(-1);
                }
                
                table = newtable;          //Update the global hashtable upon resize()
                capacity = newsize;
-               threshold = newsize * loadfactor;
+               threshold = (unsigned int) (newsize * loadfactor);
                mask = (newsize << _Shift)-1;
                
                for(unsigned int i = 0; i < oldcapacity; i++) {
@@ -88,8 +121,8 @@ template<typename _Key, typename _Val, int _Shift>
                                _Key key=bin->key;
                                struct hashlistnode<_Key, _Val> * next=bin->next;
                                
-                               unsigned int index = (key & mask) >>_Shift;
-                               struct hashlistnode<_Key, _Val> tmp=newtable[index];
+                               unsigned int index = (((_KeyInt)key) & mask) >>_Shift;
+                               struct hashlistnode<_Key, _Val> * tmp=newtable[index];
                                bin->next=tmp;
                                newtable[index]=bin;
                                bin = next;
@@ -102,7 +135,7 @@ template<typename _Key, typename _Val, int _Shift>
  private:
        struct hashlistnode<_Key,_Val> **table;
        unsigned int capacity;
-       _Key mask;
+       _KeyInt mask;
        unsigned int size;
        unsigned int threshold;
        double loadfactor;