From: Neil Smith Date: Wed, 22 Jan 2020 06:08:09 +0000 (+0400) Subject: Tidying X-Git-Url: https://git.njae.me.uk/?p=advent-of-code-19.git;a=commitdiff_plain;h=fd58472d5d6e2debd1b96fd8763891865d150402 Tidying --- diff --git a/advent23/src/advent23.hs b/advent23/src/advent23.hs index 6bcc534..fe2a9cd 100644 --- a/advent23/src/advent23.hs +++ b/advent23/src/advent23.hs @@ -49,7 +49,7 @@ main = do print $ part2 mem -part1 mem = (runNetworkUntil255 net) ^. packetY +part1 mem = runNetworkUntil255 net where net = buildNetwork mem @@ -57,9 +57,9 @@ part2 mem = runNetworkUntilTermination natNet where natNet = buildNatNetwork mem -runNetworkUntil255 :: Network -> Packet +runNetworkUntil255 :: Network -> Integer runNetworkUntil255 net0 - | not $ null goalPackets = head goalPackets + | not $ null goalPackets = (head goalPackets) ^. packetY | otherwise = runNetworkUntil255 net3 where net1 = runNetworkStep net0 (net2, packets) = extractPackets net1 @@ -145,7 +145,7 @@ extractPackets net = (net', packets) extractPacket :: EncapsulatedMacine -> [Packet] extractPacket e = if length output >= 3 - then [Packet { _destination = fromIntegral $ output!!0 + then [Packet { _destination = output!!0 , _packetX = output!!1 , _packetY = output!!2} ] else []