1 files changed, 386 insertions, 61 deletions

diff --git a/src/hash.h b/src/hash.h
index 8385bb9..b8ced99 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -1,106 +1,431 @@
 #ifndef HASH_H
 #define HASH_H
-/*
+
 #include <stddef.h>
 #include <string.h>
+#include <memory>
+#include <iostream>
 #include "hashable.h"
 
-#define bitsToBytes( n ) (n/8+(n%8>0 ? 1 : 0))
+#define bitsToBytes( n ) (n/32+(n%32>0 ? 1 : 0))
+
+template<typename T>
+uint32_t __calcHashCode( T k );
+
+template<typename T>
+bool __cmpHashKeys( T a, T b );
+
+struct __calcNextTSize_fast
+{
+  uint32_t operator()( uint32_t nCapacity, uint32_t nFill, uint32_t nDeleted ) const
+  {
+    return nCapacity*2+1;
+  }
+};
+
+template<typename key, typename value, typename sizecalc = __calcNextTSize_fast, typename keyalloc = std::allocator<key>, typename valuealloc = std::allocator<value>, typename challoc = std::allocator<uint32_t> >
+class Hash;
+
+template< typename key, typename value, typename sizecalc, typename keyalloc, typename valuealloc, typename challoc >
+struct HashProxy
+{
+        friend class Hash<key, value, sizecalc, keyalloc, valuealloc, challoc>;
+private:
+        HashProxy( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &h, key k, value v ) :
+                hsh( h ),
+                tKey( k ),
+                tValue( v ),
+                bFilled( true )
+        {
+        }
+
+        HashProxy( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &h, key k ) :
+                hsh( h ),
+                tKey( k ),
+                bFilled( false )
+        {
+        }
+
+        Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh;
+        key tKey;
+        value tValue;
+        bool bFilled;
+
+public:
+        operator value()
+        {
+                if( bFilled == false )
+                        throw "Nope, no data there";
+                return tValue;
+        }
 
-template<class key, class value>
+        value operator=( value nval )
+        {
+                hsh.insert( tKey, nval );
+                return nval;
+        }
+
+};
+
+template<typename key, typename value, typename sizecalc, typename keyalloc, typename valuealloc, typename challoc >
 class Hash
 {
-        class iterator
+public:
+        Hash() :
+                nCapacity( 11 ),
+                nFilled( 0 ),
+                nDeleted( 0 ),
+                bFilled( NULL ),
+                aKeys( NULL ),
+                aValues( NULL ),
+                aHashCodes( NULL )
         {
-                friend class Hash<key, value>;
-        private:
-                iterator( Hash<key, value> *hsh, int nIndex, key keyval, bool bInsert ) :
-                        hsh( hsh ),
-                        nIndex( nIndex ),
-                        keyval( keyval ),
-                        bInsert( bInsert )
+                nKeysSize = bitsToBytes( nCapacity );
+                bFilled = ca.allocate( nKeysSize );
+                bDeleted = ca.allocate( nKeysSize );
+                clearBits();
+
+                aHashCodes = ca.allocate( nCapacity );
+                aKeys = ka.allocate( nCapacity );
+                aValues = va.allocate( nCapacity );
+        }
+
+        virtual ~Hash()
+        {
+                for( uint32_t j = 0; j < nCapacity; j++ )
                 {
+                        if( isFilled( j ) )
+                        {
+                                va.destroy( &aValues[j] );
+                                ka.destroy( &aKeys[j] );
+                        }
                 }
+                va.deallocate( aValues, nCapacity );
+                ka.deallocate( aKeys, nCapacity );
+                ca.deallocate( bFilled, nKeysSize );
+                ca.deallocate( bDeleted, nKeysSize );
+                ca.deallocate( aHashCodes, nCapacity );
+        }
 
-        public:
-                iterator() :
-                        hsh( NULL ),
-                        nIndex( -1 )
+        void clearBits()
+        {
+                for( uint32_t j = 0; j < nKeysSize; j++ )
                 {
+                        bFilled[j] = bDeleted[j] = 0;
                 }
+        }
+
+        int hasKey( key keyval )
+        {
+                printf("%s\n", keyval );
+        }
+
+        uint32_t getCapacity()
+        {
+                return nCapacity;
+        }
+
+        uint32_t getFill()
+        {
+                return nFilled;
+        }
+
+        uint32_t getDeleted()
+        {
+                return nDeleted;
+        }
+
+        HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc> operator[]( key k )
+        {
+                uint32_t hash = __calcHashCode( k );
+                bool bFill;
+                uint32_t nPos = probe( hash, k, bFill );
 
-                iterator &operator=( iterator &src )
+                if( bFill )
                 {
-                        this->hsh = src.hsh;
-                        this->nIndex = src.nIndex;
+                        return HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>( *this, aKeys[nPos], aValues[nPos] );
                 }
+                else
+                {
+                        return HashProxy<key, value, sizecalc, keyalloc, valuealloc, challoc>( *this, k );
+                }
+        }
+
+        void insert( key k, value v )
+        {
+                uint32_t hash = __calcHashCode( k );
+                bool bFill;
+                uint32_t nPos = probe( hash, k, bFill );
 
-                iterator &operator=( value &src )
+                if( bFill )
                 {
-                        if( bInsert )
-                                printf("You wanted to insert %d\n", src );
-                        else
-                                printf("You wanted to insert %d\n", src );
+                        va.destroy( &aValues[nPos] );
+                        va.construct( &aValues[nPos], v );
+                }
+                else
+                {
+                        va.construct( &aValues[nPos], v );
+                        ka.construct( &aKeys[nPos], k );
+                        fill( nPos );
+                        aHashCodes[nPos] = hash;
+                        nFilled++;
                 }
+        }
 
-        private:
-                Hash<key, value> *hsh;
-                int nIndex;
-                bool bInsert;
-                key keyval;
-        };
+        value get( key k )
+        {
+                uint32_t hash = __calcHashCode( k );
+                bool bFill;
+                uint32_t nPos = probe( hash, k, bFill );
+
+                if( bFill )
+                {
+                        return aValues[nPos];
+                }
+                else
+                {
+                        throw "Hey, no such thing...";
+                }
+        }
+
+        uint32_t probe( uint32_t hash, key k, bool &bFill, bool rehash=true )
+        {
+                uint32_t nCur = hash%nCapacity;
+
+                // First we scan to see if the key is already there, abort if we
+                // run out of probing room, or we find a non-filled entry
+                for( int8_t j = 0;
+                        isFilled( nCur ) && j < 32;
+                        nCur = (nCur + (1<<j))%nCapacity, j++
+                        )
+                {
+                        // Is this the same hash code we were looking for?
+                        if( hash == aHashCodes[nCur] )
+                        {
+                                // Is it really the same key? (for safety)
+                                if( __cmpHashKeys( aKeys[nCur], k ) == true &&
+                                        isDeleted( nCur ) == false )
+                                {
+                                        bFill = true;
+                                        return nCur;
+                                }
+                        }
+                }
+
+                // This is our insurance, if the table is full, then go ahead and
+                // rehash, then try again.
+                if( isFilled( nCur ) && rehash == true )
+                {
+                        reHash( szCalc(getCapacity(), getFill(), getDeleted()) );
+
+                        // This is potentially dangerous, and could cause an infinite loop.
+                        // Be careful writing probe, eh?
+                        return probe( hash, k, bFill );
+                }
+
+                bFill = false;
+                return nCur;
+        }
+
+        void reHash( uint32_t nNewSize )
+        {
+                // Save all the old data
+                uint32_t nOldCapacity = nCapacity;
+                uint32_t *bOldFilled = bFilled;
+                uint32_t *aOldHashCodes = aHashCodes;
+                uint32_t nOldKeysSize = nKeysSize;
+                uint32_t *bOldDeleted = bDeleted;
+                value *aOldValues = aValues;
+                key *aOldKeys = aKeys;
+                
+                // Calculate new sizes
+                nCapacity = nNewSize;
+                nKeysSize = bitsToBytes( nCapacity );
+        
+                // Allocate new memory + prep
+                bFilled = ca.allocate( nKeysSize );
+                bDeleted = ca.allocate( nKeysSize );
+                clearBits();
+
+                aHashCodes = ca.allocate( nCapacity );
+                aKeys = ka.allocate( nCapacity );
+                aValues = va.allocate( nCapacity );
+
+                // Re-insert all of the old data (except deleted items)
+                for( uint32_t j = 0; j < nOldCapacity; j++ )
+                {
+                        if( (bOldFilled[j/32]&(1<<(j%32)))!=0 )
+                        {
+                                insert( aOldKeys[j], aOldValues[j] );
+                        }
+                }
+
+                // Delete all of the old data
+                for( uint32_t j = 0; j < nOldCapacity; j++ )
+                {
+                        if( (bOldFilled[j/32]&(1<<(j%32)))!=0 )
+                        {
+                                va.destroy( &aOldValues[j] );
+                                ka.destroy( &aOldKeys[j] );
+                        }
+                }
+                va.deallocate( aOldValues, nOldCapacity );
+                ka.deallocate( aOldKeys, nOldCapacity );
+                ca.deallocate( bOldFilled, nOldKeysSize );
+                ca.deallocate( bOldDeleted, nOldKeysSize );
+                ca.deallocate( aOldHashCodes, nOldCapacity );
+        }
 
-        template<class refval>
-        class VRef
+        void fill( uint32_t loc )
         {
+                bFilled[loc/32] |= (1<<(loc%32));
+        }
+
+        bool isFilled( uint32_t loc )
+        {
+                return (bFilled[loc/32]&(1<<(loc%32)))!=0;
+        }
+
+        bool isDeleted( uint32_t loc )
+        {
+                return (bDeleted[loc/32]&(1<<(loc%32)))!=0;
+        }
+
+        typedef struct iterator
+        {
+                friend class Hash<key, value, sizecalc, keyalloc, valuealloc, challoc>;
+        private:
+                iterator( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh ) :
+                        hsh( hsh ),
+                        bFinished( false ),
+                        nPos( 0 )
+                {
+                        nPos = hsh.getFirstPos( bFinished );
+                }
+                
+                iterator( Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh, bool bDone ) :
+                        hsh( hsh ),
+                        nPos( 0 ),
+                        bFinished( bDone )
+                {
+                }
+
+                Hash<key, value, sizecalc, keyalloc, valuealloc, challoc> &hsh;
+
+                uint32_t nPos;
+                bool bFinished;
+
         public:
-                VRef( refval &data ) :
-                        data( data )
+                iterator operator++( int )
                 {
+                        if( bFinished == false )
+                                nPos = hsh.getNextPos( nPos, bFinished );
+
+                        return *this;
+                }
+                
+                iterator operator++()
+                {
+                        if( bFinished == false )
+                                nPos = hsh.getNextPos( nPos, bFinished );
+
+                        return *this;
+                }
+
+                bool operator==( const iterator &oth )
+                {
+                        if( bFinished != oth.bFinished )
+                                return false;
+                        if( bFinished == true )
+                        {
+                                return true;
+                        }
+                        else
+                        {
+                                if( oth.nPos == nPos )
+                                        return true;
+                                return false;
+                        }
+                }
+                
+                bool operator!=( const iterator &oth )
+                {
+                        return !(*this == oth );
+                }
+
+                std::pair<key,value> operator *()
+                {
+                        return hsh.getAtPos( nPos );
                 }
-                refval &data;
         };
 
-public:
-        Hash() :
-                nCapacity( 11 ),
-                nFilled( 0 ),
-                bFilled( NULL ),
-                aKeys( NULL ),
-                aValues( NULL ),
-                aHashCodes( NULL )
+        iterator begin()
         {
-                int nKeysSize = bitsToBytes( nCapacity );
-                bFilled = new unsigned char[ nKeysSize ];
-                memset( bFilled, 0, nKeysSize );
-
-                aKeys = new VRef<key>*[nCapacity];
-                aValues = new value[nCapacity];
+                return iterator( *this );
+        }
+        
+        iterator end()
+        {
+                return iterator( *this, true );
         }
 
-        virtual ~Hash()
+private:
+        std::pair<key,value> getAtPos( uint32_t nPos )
         {
+                return std::pair<key,value>(aKeys[nPos],aValues[nPos]);
         }
 
-        iterator operator[]( key keyval )
+        uint32_t getFirstPos( bool &bFinished )
         {
-                //iterator i( this, 4, keyval, true );
-                //return i;
-                printf("%s\n", keyval.getString() );
+                for( uint32_t j = 0; j < nCapacity; j++ )
+                {
+                        if( isFilled( j ) )
+                                return j;
+                }
+
+                bFinished = true;
         }
 
-        int hasKey( key keyval )
+        uint32_t getNextPos( uint32_t nPos, bool &bFinished )
         {
-                printf("%s\n", keyval.getString() );
+                for( uint32_t j = nPos+1; j < nCapacity; j++ )
+                {
+                        if( isFilled( j ) )
+                                return j;
+                }
+
+                bFinished = true;
         }
 
 private:
-        int nCapacity;
-        int nFilled;
-        unsigned char *bFilled;
-        VRef<key> **aKeys;
-        unsigned long int *aHashCodes;
+        uint32_t nCapacity;
+        uint32_t nFilled;
+        uint32_t nDeleted;
+        uint32_t *bFilled;
+        uint32_t *bDeleted;
+        uint32_t *aHashCodes;
+        uint32_t nKeysSize;
         value *aValues;
+        key *aKeys;
+        valuealloc va;
+        keyalloc ka;
+        challoc ca;
+        sizecalc szCalc;
 };
-*/
+
+template<> uint32_t __calcHashCode<const char *>( const char *k );
+template<> bool __cmpHashKeys<const char *>( const char *a, const char *b );
+
+template<> uint32_t __calcHashCode<char *>( char *k );
+template<> bool __cmpHashKeys<char *>( char *a, char *b );
+
+template<> uint32_t __calcHashCode<const std::string>( const std::string k );
+template<> bool __cmpHashKeys<const std::string>( const std::string a, const std::string b );
+
+template<> uint32_t __calcHashCode<std::string>( std::string k );
+template<> bool __cmpHashKeys<std::string>( std::string a, std::string b );
+
+template<> uint32_t __calcHashCode<Hashable &>( Hashable &k );
+template<> bool __cmpHashKeys<Hashable &>( Hashable &a, Hashable &b );
+
 #endif