From de5ee86e2593b55a14624a048c8a4e334cc131e2 Mon Sep 17 00:00:00 2001 From: Neil Smith Date: Mon, 3 Dec 2018 12:08:43 +0000 Subject: [PATCH] Sorted out row and column terminology --- src/advent03/advent03.hs | 138 +++++++++++++++++++-------------------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/src/advent03/advent03.hs b/src/advent03/advent03.hs index cf7f945..5c4a7b0 100644 --- a/src/advent03/advent03.hs +++ b/src/advent03/advent03.hs @@ -1,95 +1,95 @@ -{-# LANGUAGE OverloadedStrings #-} + {-# LANGUAGE OverloadedStrings #-} -import Data.List -import Data.Tuple (swap) + import Data.List + import Data.Tuple (swap) -import Data.Text (Text) -import qualified Data.Text.IO as TIO + import Data.Text (Text) + import qualified Data.Text.IO as TIO -import Data.Void (Void) + import Data.Void (Void) -import Text.Megaparsec -import Text.Megaparsec.Char -import qualified Text.Megaparsec.Char.Lexer as L -import qualified Control.Applicative as CA + import Text.Megaparsec + import Text.Megaparsec.Char + import qualified Text.Megaparsec.Char.Lexer as L + import qualified Control.Applicative as CA -import qualified Data.Map.Strict as M --- import Data.Map.Strict ((!)) + import qualified Data.Map.Strict as M + -- import Data.Map.Strict ((!)) -type Position = (Int, Int) -data Claim = Claim { claimId :: Int, claimTopLeft :: Position, claimWidth :: Int, claimHeight :: Int } deriving (Show, Eq) -type Fabric = M.Map Position Int + type Position = (Int, Int) -- row, column + data Claim = Claim { claimId :: Int, claimTopLeft :: Position, claimWidth :: Int, claimHeight :: Int } deriving (Show, Eq) + type Fabric = M.Map Position Int -main :: IO () -main = do - text <- TIO.readFile "data/advent03.txt" - let claims = successfulParse text - let fabric = foldl' addClaim M.empty claims - print $ part1 fabric - print $ part2 fabric claims + main :: IO () + main = do + text <- TIO.readFile "data/advent03.txt" + let claims = successfulParse text + let fabric = foldl' addClaim M.empty claims + print $ part1 fabric + print $ part2 fabric claims -part1 :: Fabric -> Int -part1 = M.size . overclaimed + part1 :: Fabric -> Int + part1 = M.size . overclaimed -part2 :: Fabric -> [Claim] -> Int -part2 fabric claims = claimId $ head $ filter noOverlap' claims - where noOverlap' claim = noOverlap fabric claim + part2 :: Fabric -> [Claim] -> Int + part2 fabric claims = claimId $ head $ filter noOverlap' claims + where noOverlap' claim = noOverlap fabric claim -claimedSquares :: Claim -> [Position] -claimedSquares claim = [(r, c) | r <- [l .. (l + w - 1)] - , c <- [t .. (t + h - 1)] - ] - where (t, l) = claimTopLeft claim - h = claimHeight claim - w = claimWidth claim + claimedSquares :: Claim -> [Position] + claimedSquares claim = [(r, c) | r <- [r0 .. (r0 + h - 1)] + , c <- [c0 .. (c0 + w - 1)] + ] + where (r0, c0) = claimTopLeft claim + h = claimHeight claim + w = claimWidth claim -addClaim :: Fabric -> Claim -> Fabric -addClaim fabric claim = foldl' addSquare fabric squares - where squares = claimedSquares claim + addClaim :: Fabric -> Claim -> Fabric + addClaim fabric claim = foldl' addSquare fabric squares + where squares = claimedSquares claim -addSquare :: Fabric -> Position -> Fabric -addSquare fabric square = M.insert square (currentClaims + 1) fabric - where currentClaims = M.findWithDefault 0 square fabric + addSquare :: Fabric -> Position -> Fabric + addSquare fabric square = M.insert square (currentClaims + 1) fabric + where currentClaims = M.findWithDefault 0 square fabric -overclaimed :: Fabric -> Fabric -overclaimed = M.filter ( > 1) + overclaimed :: Fabric -> Fabric + overclaimed = M.filter ( > 1) -noOverlap fabric claim = M.null $ overclaimed existing - where claimedFabric = addClaim M.empty claim - existing = fabric `M.intersection` claimedFabric + noOverlap fabric claim = M.null $ overclaimed existing + where claimedFabric = addClaim M.empty claim + existing = fabric `M.intersection` claimedFabric --- Parse the input file + -- Parse the input file -type Parser = Parsec Void Text + type Parser = Parsec Void Text -sc :: Parser () -sc = L.space (skipSome spaceChar) CA.empty CA.empty --- sc = L.space (skipSome (char ' ')) CA.empty CA.empty + sc :: Parser () + sc = L.space (skipSome spaceChar) CA.empty CA.empty + -- sc = L.space (skipSome (char ' ')) CA.empty CA.empty -lexeme = L.lexeme sc -integer = lexeme L.decimal -symb = L.symbol sc + lexeme = L.lexeme sc + integer = lexeme L.decimal + symb = L.symbol sc -hashP = symb "#" -atP = symb "@" -colonP = symb ":" -commaP = symb "," -exP = "x" + hashP = symb "#" + atP = symb "@" + colonP = symb ":" + commaP = symb "," + exP = "x" -claimsFileP = many claimP + claimsFileP = many claimP -idP = hashP *> integer -leftTopP = (,) <$> integer <* commaP <*> integer -widthHeightP = (,) <$> integer <* exP <*> integer + idP = hashP *> integer + leftTopP = (,) <$> integer <* commaP <*> integer + widthHeightP = (,) <$> integer <* exP <*> integer -claimP = claimify <$> idP <* atP <*> leftTopP <* colonP <*> widthHeightP - where claimify cid lt (w, h) = Claim { claimId = cid, claimTopLeft = swap lt, claimWidth = w, claimHeight = h } + claimP = claimify <$> idP <* atP <*> leftTopP <* colonP <*> widthHeightP + where claimify cid cr (w, h) = Claim { claimId = cid, claimTopLeft = swap cr, claimWidth = w, claimHeight = h } -successfulParse :: Text -> [Claim] -successfulParse input = - case parse claimsFileP "input" input of - Left _error -> [] -- TIO.putStr $ T.pack $ parseErrorPretty err - Right claims -> claims \ No newline at end of file + successfulParse :: Text -> [Claim] + successfulParse input = + case parse claimsFileP "input" input of + Left _error -> [] -- TIO.putStr $ T.pack $ parseErrorPretty err + Right claims -> claims \ No newline at end of file -- 2.34.1