From b4c65065963a37afdd73732c02e9458e17028a2e Mon Sep 17 00:00:00 2001 From: cdimitroulas Date: Sun, 3 Dec 2023 21:18:46 +0000 Subject: [PATCH] Day 3 --- advent-of-code2023.cabal | 11 +++ data/day03.txt | 140 +++++++++++++++++++++++++++++++++++++++ package.yaml | 3 + src/Lib/Matrix.hs | 21 ++++++ src/Main.hs | 2 + src/Solutions/Day03.hs | 108 ++++++++++++++++++++++++++++++ test/Day03.hs | 37 +++++++++++ 7 files changed, 322 insertions(+) create mode 100644 data/day03.txt create mode 100644 src/Lib/Matrix.hs create mode 100644 src/Solutions/Day03.hs create mode 100644 test/Day03.hs diff --git a/advent-of-code2023.cabal b/advent-of-code2023.cabal index bbe4635..07d1d0e 100644 --- a/advent-of-code2023.cabal +++ b/advent-of-code2023.cabal @@ -22,8 +22,10 @@ library exposed-modules: Solutions.Day01 Solutions.Day02 + Solutions.Day03 other-modules: Lib.AOC + Lib.Matrix Lib.Parsing Main Paths_advent_of_code2023 @@ -58,17 +60,21 @@ library build-depends: attoparsec , base >=4.7 && <5 + , containers , regex-tdfa , text + , vector default-language: Haskell2010 executable advent-of-code2023 main-is: Main.hs other-modules: Lib.AOC + Lib.Matrix Lib.Parsing Solutions.Day01 Solutions.Day02 + Solutions.Day03 Paths_advent_of_code2023 autogen-modules: Paths_advent_of_code2023 @@ -101,8 +107,10 @@ executable advent-of-code2023 build-depends: attoparsec , base >=4.7 && <5 + , containers , regex-tdfa , text + , vector default-language: Haskell2010 test-suite unit-test @@ -111,6 +119,7 @@ test-suite unit-test other-modules: Day01 Day02 + Day03 Paths_advent_of_code2023 autogen-modules: Paths_advent_of_code2023 @@ -146,8 +155,10 @@ test-suite unit-test advent-of-code2023 , attoparsec , base >=4.7 && <5 + , containers , regex-tdfa , tasty , tasty-hunit , text + , vector default-language: Haskell2010 diff --git a/data/day03.txt b/data/day03.txt new file mode 100644 index 0000000..4eccb80 --- /dev/null +++ b/data/day03.txt @@ -0,0 +1,140 @@ +...733.......289..262.....520..................161.462..........450.........................183............................................. +....*....................*.............707.352....*............/.....................801...@...............333..196........484.635......287. +....42.........131....913..............*......&..........634..................440..&...............83.....@...........404$..=....*..423.*... +618.......272....*.........&......547.344...............#............689.589.*....150......382=................................168......433. +..........=...............253.102*.........#......78.......804..........*........................858.........................-.............. +...69.......*37...510.797...........596.946........#..................................602.175...............203..100..........681.......546. +...*.....110.....*......*..........*..........396......858=.......381....................*.......246*637..........=..391+................... +...973........274..551.............576.21@.......$..................*.......................................176............181.883......*... +.......223............+............................649.701.936...17..482..........80...........210.......+...=.........563.......*...222.... +.373..*..................532....707.......956....@..+.....*......*...........+927.*......698......+....763.........275*.....27..498......... +....*......................+......*.........*..719....540.........24...=...........39...*...................514.........126..#.............. +.....974.......952*308..@..........965....450............*4.343......772../..............437............=....*............./.....309........ +............58..........840.....34................877........$............189..................*186......657.670................&.......854. +....22.406..*......883............*......880...........939...................................58.....387..................*.................. +......*....587.........564/......599.......*...........*......................831.891/...552..........$.534+.....%802.975.960.346*.......... +.792+..............828................-807.6...........326....324...722...334..*...........*................................................ +.....................*.......................895..764*.........=...*........*..611..........79.......461@..546*940...818.346..........247... +....%....473......................288.......*....................932.....590...........918......791..................................*...... +.....621...*........................*....129....425.10.....*.....................419....*.........*...166......#11...................831.... +119........302.832.............159.506................*.229.....493....39...............587....523.......*..........610...805.559........... +......971.......*..........229*..........961........139..................+....411..................554....26.90.....$........*....-......... +...........463.615...................315....#...................................-...422.......109.-............*247................231.56... +..279*159.*...........126...569...............906..20..........990..........27.........%.......*.............................960-......./... +...........364....812*.......*..$.........812*....*.....369....&......176......................15.346#...#.....908...828..........-650...... +.842*771....................189..9...............42...............897*...............479.................99.....+.......*................... +................842*356.849...............336.......201................412......./...@...........205....................956....*319.383*.... +...438....&................*......../.......*.../...*....&.......62...*........348..............*....................54.....302.........298. +......$..318................264.....28...259..824..306...249.......&.392...444............889#..418....945...496..../....................... +................610.160......................................................%.699...987......................*............................. +..........@125.....*..............292..#....514..........................165....*...*....&.....*672.....551.194.426......53...500.599...278. +.275.192.........................*....854..#..............190............$.....40..662.706..774.........$................../..*......*...... +....*.........*840....*638.....82...................520...*................................................../.190...719.......34....620.... +...........532.....521................................*...423..75..........+....-........#...29.......258.605.....*..-...................... +...........................37........../354.%453.....248.........*...561.481....727....437........969...*......243.......................... +..................................183.........................+..250...+...................312.....=....150............@...229.............. +...624...454*710..../..........=..*......../........%30....308..............................*................+...381..941........461.341.... +......=............19.........297.......213..........................%............*522......442............962...-............92..-.....*... +.................................................324.663............775...290=.301...............=...15........=....780..................562 +747........................438...35...806*.......*......................................%396..508......*700...16..-..$..230....443..617..... +.......$.........447......*...............336..424.........618........-..276......260............................452......#......*...*...... +....824..@916....%...488..145....%.....55..........821.....#.....620.773....*116..*.......384............156.972................974..872.... +...................=...........494.....*......609................*...............768..195..*......108/..........*......440.................. +...187...........135.=.....44.........860..........$.......+..923...........966..........#..136.................423.......#....185.......... +.....*....298........761.........................217....157..................*.....................292....268........#........./............ +..789........../.375.........919.......425.........................542.....691..69..........184......*.......*.....578............531....... +.......740..619..*..............=........%....788.....+..324..........*..........*......531..*..=82....962.409.690..........981............. +......*...........652..+.........................*....32.#...........53...........761...*...353.....43*.......................*....6....611. +....589......../........190.362@....961...........917......*...........................165...............&..718...............633...*....... +.............781...565...............*................&..324...............................339..........964..+..........%..........427..312. +.........927.......*........#260......919.......828..469........585..........803............/...&.......................365................. +....406..........190........................308.*.................*.............*2.803&.........417....=............................955..126 +.....#...61.75.......149....293.768....678#......675............449.....@...............%...............347......301.....-.490.....*........ +............*........*.........*.............751........................888..&..348..49.747.........................*.318..#....888......... +..........160......335.................455....*.......761...................564..*............*926...654...../....907................857.... +.....446.....................@....915.....&....639...=...........285..............567......862................731..............9........*... +..........513.............694..........$...............233..721.&................................806.....101.........729.......@.........292 +...........*.....565..................329................*..*........137......$849...=773...........=...*.............*..+..........32...... +...359.277..849.....*399..................274....535....348.950.....*...............................................553..607......../....... +.....%.*.................*...146.564.818....*.....*................438..............343..945......85............162......................... +...#...67.374..*593.....740......*......*..553...795..664...$................493#....*............-...............*...971................... +...510.....+........843.......791..277.................*....958....................489..#.................*657.213.....*...610.....193...... +........*......#....#.................#.......$..&12....531......167......659*...........521...157*....896...........503......+.......*241.. +257..171.245....959........................109................+...............454..................239...../................................ +...*...............................................#..........203...%...&..............359.330.846........751...382.985&.........646$..#.... +..624........453..................870......890#...662.............371..311...739..........*.......*.............*............=.........817.. +..................................*....................250.....54............*......../..........182...........237.....261@.250............. +................743.......946.....943.....414#...80....@.........*..751............159..448..............91.............................&529 +683....@....370..............*........569..........$........131...........@34..........*....736.........*...434*929.........127............. +...*.110.....*....48..........644....*....467.................*...............92.....673.......*718.....697.............979.&............... +.745.......503.......288..827.....911.......+.......79..290.191..........$....*....................................230..........517......... +.........%.....551..=.....#...........192.....917..&............597...479.....316.743...%.........#................*........122..*.......... +....529.461.../..............793.........*633..*.................%..................=.604.........320.......393..599.........*....717....... +768...*...............=567.....-.144..............545................6....591..............216*.......73..*....*........215+.842............ +.....783....855............196......*.........909..*......537.......*......=....435............874.../...902.657........................@449 +.............*........%510........28..........*...605.....@.......468............#.....630........................418@..............701..... +......397.....748........../...+........487..521......934...................&992.....-.....160.......477.....-.......................*...... +.916.................476.651..462..........%...........*...464......................425....*...........*..531...735....=..878.....853....... +....*...............*.............*..................965...*.........754..3..657.......................92..........@..838................... +.....116.....469...498........537..666....622&............237.......*..........*....204...........242.........&...............599=.......... +..............-................../.............283=...........283#.919.........638.*.........452.....*794......204.326...................168 +...........................541........................544.............../183........67..903+........................*....75.512..605........ +860..............*.........*.............455....730....*......................143................@....-.....=...366.......@......*...+59.... +...*..............447....916.....127........+.....*.....60................./....*...............572.658...891...+...300.....674.733......... +.768................................*.-..........522.28.......870.....-....89./......764*...........................*........%.............. +............606....*...................798..............298...*......342......430........668.........485.270.265/..893..............=....524 +......#.880*.......88..907.........239..........509....=......406.+..........................264........*................829........991.%... +....850.................%.....&913....*...........*...............302..&228.......%601....63*......414....*156.............&...310.......... +.............@....184.......=.......260..........748........................149................................895.....697.......*.66....... +..........483.......*....500..970.......88..941...........25.....623...436...*.....................278..........=......*......522..*........ +................................*.........*.-.......885....*.......#....$..848........260.........-.....579.........950...........948....... +...........270..........+....$..736.....245.........*....936.512........................*...@..........*.....$.&.........790................ +.....................634...764....................488.........#......454...............46.995........344...59..135..........#.@851...@949... +808.......214.............................................610...................................185*........................................ +...........*.............+...........812........606..........*.................383..................218...355/................804.@687...... +.....751.476......145.....991.314.........................123.....917......434....*.634..&....@.................805....15......*............ +......#......25......*884......*..@......526*.................*20....*....*.....328.$....672.245....*392.423$...-.....*......83....484.581.. +..............................440.759............124*397...779.......752.303.....................764.................376.806......*....*.... +.401..976...75....765.......................%.......................................430...................................*......796....82.. +........*...&......*......474...2.-351....287.....=........@.......%....%....*731......$.......=....976.........960#.381..192............... +........808........959.......#.....................322......243...534.134.828............*....95.........241...........*.......388...567.... +....$.........511......435.........825..................................................742...............&........%....888...#............. +....53...........-....................$.......-...........................191.....933........454...................649..........=........... +.....................993..430*....624........817.102.......660...............*.../.....157/...*...............................845........... +.....&.....466..692.....*....../.....*.................987.........381....746..................744...........722.........340................ +..526.........*...*......74..810....257.........-....../............*...........941..898..................../......769...=...480..$...@..... +........658...338.107..+.................563..550........388*....542.............+....&........112......572........&........*....553...588.. +631........#..........641..759......880.@....................740........247....................*...........*............$....310............ +..........................@.........*.............888....&........-.....*....3....154....790..24..847/......767......933..............#..... +.....790...684....669............626....324....@.......862......77..+....627..*......*....*.....................809*.............922..913... +......*.............*.....*243..................372..........+.......878.......155.36...656....%..........917.............#.....*........... +....935....184/....888.357.....917..797....293...............427............................665..766.........*.........986.......671........ +................................*..................................93.247................$..........*641....598..........................459 +........................922*295..664....&..........188%.481..............*.............35.............................806.......107*32..*... +..........261.$113.....................456...................916..480....942.848.....................781*3.146..168....*......=..........222 +137.......*.................243..............783*......940......*....*........*......155......*25...........*...$...902........217.......... +.../....460.....140..170.........................283..*......647...501...-.359...365.......491.........869..103............................. +...............*......$.........941..................75................282....../...............786*.....*......741.686......24............. +527........................*109.*...522..................*79.....#575...............................810...373..*......*..444*............... +...*..&37...............331.................714*..............................62$...43..%.......................983.446.............79...... +886.............................................40.................506.421..............726............171...............676*964.....*...... +................651#...301..500..497.......601*......%...263*675......*.......136*56..................*.............836...............264... +........229....................#...&...156.....495..769......................................597.......355.............#..365...379......... +....539.......%...933...................*..138..................402...730.......................*718.......12................$.*............ +....*........63...*....................368.....691....................*..............................#...../.....772............116......... +....501............777.......673..728......613.&...467....688.../..526...387...726.......@568.260..456..............*.......64.............. +403...........................*.....................*.....*...311.......&.....*....387.........*.......437..$901...744.929.................. +...*.......................825.........&...........867.........................994...@........346.......................*.............285... +....260........892*.................294..................................#............................................172.....730........... +........743........610.........954......44@.46....606$..................718......963.970.........863.....772..............*......*.......... +284.......*............950.....*..............@..................=.............*......%.............*425.../..=625.....479.305.331...-...... +...*...139................*...976........32........-.............655..........233.373.....870..431..................................17...... +399...........820........844.........%....../744.353.&...................370........*......*...........@...135..700............*............ +....*364.#....../....266...........295................486..........932..........98.311....319..........599....*.&.......98.#....202......... +.........768.........*.........982...........................413....*....185.....+................637.......48...........*.132.............. +.....................239........*.....................551.......*38.111....*.@.....778...856*25........605...../....355.........230......... +...105..........*.............879........264....177.....*.783............839.682......*..............*.....-....756....*...415.*.....589-... +.............438....................428....*.........465.....*194....................803....100...955.238..836.........767.%...555.......... +.....86....&........702........./..*.......363.........................=630.737#............%...........................................259. +......*....256.......*.......+..57..806.......................591*............................*348....829...................+460............ +.....................244....6.....................................789......................687.............................................. diff --git a/package.yaml b/package.yaml index a445fc6..78f1fa8 100644 --- a/package.yaml +++ b/package.yaml @@ -39,8 +39,10 @@ default-extensions: dependencies: - base >= 4.7 && < 5 - attoparsec + - containers - regex-tdfa - text + - vector ghc-options: - -Wall @@ -63,6 +65,7 @@ library: exposed-modules: - Solutions.Day01 - Solutions.Day02 + - Solutions.Day03 tests: unit-test: diff --git a/src/Lib/Matrix.hs b/src/Lib/Matrix.hs new file mode 100644 index 0000000..8045983 --- /dev/null +++ b/src/Lib/Matrix.hs @@ -0,0 +1,21 @@ +module Lib.Matrix (Matrix, (!), (!?), height, width) where + +import Data.Vector (Vector) +import qualified Data.Vector as V +import Prelude hiding (elem) + +type Matrix a = Vector (Vector a) + +type Position = (Int, Int) -- x, y + +(!) :: Position -> Matrix a -> a +(!) (x, y) mat = mat V.! y V.! x + +(!?) :: Position -> Matrix a -> Maybe a +(!?) (x, y) mat = mat V.!? y >>= (V.!? x) + +height :: Matrix a -> Int +height = V.length + +width :: Matrix a -> Int +width = V.length . V.head diff --git a/src/Main.hs b/src/Main.hs index 74499ac..ad7cbe5 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -1,8 +1,10 @@ module Main (main) where import Solutions.Day01 (day01) import Solutions.Day02 (day02) +import Solutions.Day03 (day03) main :: IO () main = do day01 day02 + day03 diff --git a/src/Solutions/Day03.hs b/src/Solutions/Day03.hs new file mode 100644 index 0000000..7657fd0 --- /dev/null +++ b/src/Solutions/Day03.hs @@ -0,0 +1,108 @@ +module Solutions.Day03 (day03, parser, part1, part2) where + +import Control.Applicative +import qualified Data.Attoparsec.Text as P +import Data.Char (digitToInt) +import Data.Functor (($>)) +import Data.Maybe (catMaybes, fromJust, fromMaybe) +import qualified Data.Text as T +import Data.Vector (Vector) +import qualified Data.Vector as V +import Lib.AOC (runSolution) +import qualified Lib.Matrix as Matrix +import Lib.Parsing (linesOf) + +data SchematicItem = Number Int | Symbol Char deriving (Eq, Show) + +isSymbol :: SchematicItem -> Bool +isSymbol (Symbol _) = True +isSymbol _ = False + +isNumber :: SchematicItem -> Bool +isNumber (Number _) = True +isNumber _ = False + +getNumberVal :: SchematicItem -> Int +getNumberVal (Number x) = x +getNumberVal _ = error "Tried to extract number from non-Number SchematicItem" + +type Matrix a = Vector (Vector a) + +type Input = Matrix (Maybe SchematicItem) + +day03 :: IO () +day03 = runSolution "03" parser (fmap part1) (fmap part2) + +parser :: String -> Either String Input +parser = fmap (V.map combineNumbers) . P.parseOnly (V.fromList <$> linesOf (V.fromList <$> P.many1 schematicItemParser)) . T.pack + +part1 :: Input -> Int +part1 input = + sum $ + map (\(Number x) -> x) $ + catMaybes $ + removeConseqDups $ + map (Matrix.! input) $ + getPartNumberPositions input + +schematicItemParser :: P.Parser (Maybe SchematicItem) +schematicItemParser = + (P.char '.' $> Nothing) + <|> (Just . Number . digitToInt <$> P.digit) + <|> (Just . Symbol <$> P.notChar '\n') + +-- Combines the individual digits into larger numbers +combineNumbers :: Vector (Maybe SchematicItem) -> Vector (Maybe SchematicItem) +combineNumbers = V.fromList . combineNumbers' . V.toList + where + isNumber' (Just x) = isNumber x + isNumber' _ = False + + combineNumbers' [] = [] + combineNumbers' ((Just (Number x1)) : xs) = + let conseqNums = map (getNumberVal . fromJust) $ takeWhile isNumber' xs + combinedNum = read $ concatMap show (x1 : conseqNums) + in replicate (length conseqNums + 1) (Just (Number combinedNum)) <> combineNumbers' (drop (length conseqNums) xs) + combineNumbers' (x : xs) = x : combineNumbers' xs + +getSymbolPositions :: Input -> [(Int, Int)] +getSymbolPositions mat = do + yPosition <- [0 .. Matrix.height mat - 1] + xPosition <- V.toList $ V.findIndices (fromMaybe False . (Just isSymbol <*>)) (mat V.! yPosition) + return (xPosition, yPosition) + +getPartNumberPositions :: Input -> [(Int, Int)] +getPartNumberPositions = concatMap neighborPositions . getSymbolPositions + +neighborPositions :: (Int, Int) -> [(Int, Int)] +neighborPositions (x, y) = + [ (x + 1, y), + (x + 1, y - 1), + (x, y - 1), + (x - 1, y - 1), + (x - 1, y), + (x - 1, y + 1), + (x, y + 1), + (x + 1, y + 1) + ] + +removeConseqDups :: (Eq a) => [a] -> [a] +removeConseqDups [] = [] +removeConseqDups (x1 : x2 : xs) = if x1 == x2 then removeConseqDups (x2 : xs) else x1 : removeConseqDups (x2 : xs) +removeConseqDups (x : xs) = x : removeConseqDups xs + +part2 :: Input -> Int +part2 input = sum gearRatios + where + gearRatios :: [Int] + gearRatios = map (product . getGearAdjacentNums) $ filter isGear potentialGearPositions + + potentialGearPositions = do + yPosition <- [0 .. Matrix.height input - 1] + xPosition <- V.toList $ V.findIndices (== Just (Symbol '*')) (input V.! yPosition) + return (xPosition, yPosition) + + getGearAdjacentNums = map getNumberVal . filter isNumber . catMaybes . removeConseqDups . map (Matrix.! input) . neighborPositions + + isGear :: (Int, Int) -> Bool + isGear gearPos = length (getGearAdjacentNums gearPos) == 2 diff --git a/test/Day03.hs b/test/Day03.hs new file mode 100644 index 0000000..03df337 --- /dev/null +++ b/test/Day03.hs @@ -0,0 +1,37 @@ +{-# OPTIONS_GHC -Wno-missing-export-lists #-} +module Day03 where + +import Test.Tasty +import Test.Tasty.HUnit +import Solutions.Day03 (parser, part1, part2) + +exampleInput :: String +exampleInput = "467..114..\n\ + \...*......\n\ + \..35..633.\n\ + \......#...\n\ + \617*......\n\ + \.....+.58.\n\ + \..592.....\n\ + \......755.\n\ + \...$.*....\n\ + \.664.598.." + +test_day03 :: TestTree +test_day03 = testGroup "Day03" + [ + testCase "part 1 - example input" $ do + part1 <$> parser exampleInput @?= Right 4361, + + -- testCase "part 1" $ do + -- input <- parser <$> readFile "data/day02.txt" + -- part1 <$> input @?= Right 2632, + + testCase "part 2 - example input" $ do + part2 <$> parser exampleInput @?= Right 467835 + + -- testCase "part 2" $ do + -- input <- parser <$> readFile "data/day02.txt" + -- part2 <$> input @?= Right 69629 + ] +