From 70b3e8be896542304ba1a4d88cc1b5cbb6176df3 Mon Sep 17 00:00:00 2001 From: Neil Smith Date: Thu, 14 Dec 2017 22:03:41 +0000 Subject: [PATCH] Day 14 now using a set --- advent-of-code.cabal | 2 +- src/advent14/advent14.hs | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/advent-of-code.cabal b/advent-of-code.cabal index 5a2aa81..e133aae 100644 --- a/advent-of-code.cabal +++ b/advent-of-code.cabal @@ -135,7 +135,6 @@ executable advent14 , containers , parallel - executable advent14serial hs-source-dirs: src/advent14 main-is: advent14serial.hs @@ -143,3 +142,4 @@ executable advent14serial build-depends: base >= 4.7 && < 5 , split , containers + diff --git a/src/advent14/advent14.hs b/src/advent14/advent14.hs index d091ee1..8c49253 100644 --- a/src/advent14/advent14.hs +++ b/src/advent14/advent14.hs @@ -2,10 +2,13 @@ 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 qualified Data.Map.Strict as M +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" @@ -35,16 +38,16 @@ numKey :: (Int, Int) -> Int numKey (r, c) = 128 * r + c -presentCells :: [String] -> CellMap -presentCells bhs = M.fromList [((r, c), True) | r <- [0..127], c <- [0..127], (bhs!!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)] -cellEdges :: CellMap -> [G.SCC (Int, 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] :: [Integer]) -- 2.34.1