simplifyrewrite

1 files changed, 5 insertions, 10 deletions

diff --git a/src/PPL/Internal.hs b/src/PPL/Internal.hs
index 462be20..2639e72 100644
--- a/src/PPL/Internal.hs
+++ b/src/PPL/Internal.hs
@@ -39,25 +39,20 @@ import Data.Bits
 
 type HashMap k v = H.Dictionary (H.PrimState IO) UM.MVector k UM.MVector v
 
-
 -- Simple hashing scheme into 64-bit space based on mzHash64
-data Hash = Hash Int Int Word8 Word64 deriving (Eq, Ord, Show)
+data Hash = Hash Int Word64 deriving (Eq, Ord, Show)
 
 unhash :: Hash -> Word64
-unhash h@(Hash _ j w8 _) = let Hash _ _ _ s = addhash (fromIntegral j) $ addhash (fromIntegral w8) h in s
-
-addhash :: Word8 -> Hash -> Hash
-addhash x (Hash i j bits state) = Hash (i+1) j bits $ (0xB2DEEF07CB4ACD43 * (fromIntegral i + fromIntegral x)) `xor` (state `shiftL` 2) `xor` (state `shiftR` 2)
-initHash = Hash 0 0 0 0xE297DA430DB2DF1A
+unhash (Hash _ state) = state
 
 pushbit :: Bool -> Hash -> Hash
-pushbit b h@(Hash i j bits state)
-  | j == 8 = let Hash i _ _ state = addhash bits h in Hash i 1 (fromBool b) state
-  | otherwise = Hash i (j+1) (bits*2 + fromBool b) state
+pushbit b (Hash i state) = Hash (i+1) $ (0xB2DEEF07CB4ACD43 * (fromIntegral i + fromBool b)) `xor` (state `shiftL` 2) `xor` (state `shiftR` 2)
   where
     fromBool True = 1
     fromBool False = 0
 
+initHash = Hash 0 0xE297DA430DB2DF1A
+
 -- Reimplementation of the LazyPPL monads to avoid some dependencies
 
 data Tree = Tree