X-Git-Url: https://git.njae.me.uk/?p=advent-of-code-20.git;a=blobdiff_plain;f=advent12%2Fsrc%2Fadvent12.hs;h=c109c1849547c214b2e62ba8be44c1be845b7482;hp=fb75491e4c8e3e80065d06cd0a53c4e21b790bc3;hb=7f33f392172a57f78d4de4a94af76a2f08428b66;hpb=0f78ee34867c196e4ac5d35c96334f0b644c23d9 diff --git a/advent12/src/advent12.hs b/advent12/src/advent12.hs index fb75491..c109c18 100644 --- a/advent12/src/advent12.hs +++ b/advent12/src/advent12.hs @@ -46,15 +46,15 @@ part2 actions = manhattan (positionW ship1) start ship0 = ShipW {positionW = start, waypoint = (10, 1)} ship1 = foldl actW ship0 actions -apAc actions = ship1 - where start = (0, 0) - ship0 = Ship {position = start, direction = East } - ship1 = foldl act ship0 actions +-- apAc actions = ship1 +-- where start = (0, 0) +-- ship0 = Ship {position = start, direction = East } +-- ship1 = foldl act ship0 actions -apAcW actions = ship1 - where start = (0, 0) - ship0 = ShipW {positionW = start, waypoint = (10, 1) } - ship1 = foldl actW ship0 actions +-- apAcW actions = ship1 +-- where start = (0, 0) +-- ship0 = ShipW {positionW = start, waypoint = (10, 1) } +-- ship1 = foldl actW ship0 actions act Ship{..} (N d) = Ship { position = dDelta d North position, ..} act Ship{..} (S d) = Ship { position = dDelta d South position, ..} @@ -63,9 +63,7 @@ act Ship{..} (E d) = Ship { position = dDelta d East position, ..} act Ship{..} (L a) = Ship { direction = d, ..} where d = (iterate predW direction) !! (a `div` 90) act Ship{..} (R a) = Ship { direction = d, ..} where d = (iterate succW direction) !! (a `div` 90) act Ship{..} (F d) = Ship { position = dDelta d direction position, ..} - -- where (x, y) = position - -- (dx, dy) = (delta direction) - -- p' = (x + (d * dx), y + (d * dy)) + actW ShipW{..} (N d) = ShipW { waypoint = dDelta d North waypoint, ..} actW ShipW{..} (S d) = ShipW { waypoint = dDelta d South waypoint, ..}