X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=src%2Fadvent14%2Fadvent14.hs;h=698853c7bcd2c60b0a891598e0ee9b0bbcc9f41f;hb=f12a6a3138c30e2a034daef9d75567694f7213b5;hp=45c9dd2c45a67ea85f7714e93b2cb27899b37006;hpb=a8bef43eb05fec6556efe2addf917d59600b4d65;p=advent-of-code-17.git

diff --git a/src/advent14/advent14.hs b/src/advent14/advent14.hs
index 45c9dd2..698853c 100644
--- a/src/advent14/advent14.hs
+++ b/src/advent14/advent14.hs
@@ -2,11 +2,11 @@ import Data.List.Split (chunksOf)
 import Data.Char (ord)
 import Text.Printf (printf)
 import Data.Bits (xor)
-import qualified Data.Map.Strict as M
-import Data.Map.Strict ((!))
+import qualified Data.Set as S
 import qualified Data.Graph as G
+import Control.Parallel.Strategies (parMap, rpar)
 
-type CellMap = M.Map (Int, Int) Bool
+type CellSet = S.Set (Int, Int)
 
 puzzleKey = "xlqgujun"
 
@@ -15,21 +15,19 @@ main = do
   print $ part1 puzzleKey
   print $ part2 puzzleKey
 
--- part1 :: String -> Int
--- part1 key = sum rowCounts
---     where hashes = map knotHash $ rowSpecs key
---           rowCounts = map (countSetBits . binify) hashes
 
 part1 :: String -> Int
 part1 key = sum rowCounts
-    where binHashes = map binHash $ rowSpecs key
-          rowCounts = map countSetBits binHashes
+    where rowCounts = parMap rpar countSetBits $ binHashes key
 
 
--- part2 :: String -> Int
+part2 :: String -> Int
 part2 key = length $ cellEdges cells
-    where binHashes = map binHash $ rowSpecs key
-          cells = presentCells binHashes
+    where cells = presentCells $ binHashes key
+
+binHashes :: String -> [String]
+binHashes key = parMap rpar binHash $ rowSpecs key
+
 
 binHash :: String -> String
 binHash = binify . knotHash
@@ -38,20 +36,19 @@ numKey :: (Int, Int) -> Int
 numKey (r, c) = 128 * r + c
 
 
-presentCells :: [String] -> CellMap
-presentCells binHashes = M.fromList [((r, c), True) | r <- [0..127], c <- [0..127], (binHashes!!r)!!c == '1']
+presentCells :: [String] -> CellSet
+presentCells bhs = S.fromList [(r, c) | r <- [0..127], c <- [0..127], (bhs!!r)!!c == '1']
 
-adjacentCells :: CellMap -> (Int, Int) -> [(Int, Int)]
-adjacentCells cells (r, c) = filter (\k -> M.member k cells) possibles
+adjacentCells :: CellSet -> (Int, Int) -> [(Int, Int)]
+adjacentCells cells (r, c) = filter (\k -> S.member k cells) possibles
   where possibles = [(r, c - 1), (r, c + 1), (r - 1, c), (r + 1, c)]
-        -- isPresent rc = length $ rc `member` cells
 
 
--- cellEdges :: CellMap -> Int
-cellEdges cells = G.stronglyConnComp [(k, numKey k, map numKey $ adjacentCells cells k) | k <- M.keys cells]
+cellEdges :: CellSet -> [G.SCC (Int, Int)]
+cellEdges cells = G.stronglyConnComp [(k, numKey k, map numKey $ adjacentCells cells k) | k <- S.elems cells]
 
 rowSpecs :: String -> [String]
-rowSpecs key = map (((key ++ "-") ++) . show) [0..127]
+rowSpecs key = map (((key ++ "-") ++) . show) ([0..127] :: [Integer])
 
 countSetBits :: String -> Int
 countSetBits = length . filter (== '1')
@@ -87,8 +84,8 @@ mkHashTerms :: String -> [Int]
 mkHashTerms text = take (length chunk * 64) $ cycle chunk
     where chunk = map ord text ++ [17, 31, 73, 47, 23]
 
-hexify :: [Int] -> String
-hexify = concatMap (printf "%02x")
+-- hexify :: [Int] -> String
+-- hexify = concatMap (printf "%02x")
 
 binify :: [Int] -> String
 binify = concatMap (printf "%08b")