From cb79a32fd5ed1381d8c5b289a57b793b860f8960 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 7 Dec 2020 17:54:29 +0100 Subject: [PATCH] Add 2015 day 7 --- haskellAoC/inputs/2015/07 | 339 ++++++++++++++++++++++++++++++++++ haskellAoC/package.yaml | 5 +- haskellAoC/src/Y2015/Day07.hs | 56 ++++++ haskellAoC/src/Y2015/Days.hs | 2 + haskellAoC/stack.yaml | 3 + haskellAoC/stack.yaml.lock | 9 +- 6 files changed, 411 insertions(+), 3 deletions(-) create mode 100644 haskellAoC/inputs/2015/07 create mode 100644 haskellAoC/src/Y2015/Day07.hs diff --git a/haskellAoC/inputs/2015/07 b/haskellAoC/inputs/2015/07 new file mode 100644 index 0000000..56cae92 --- /dev/null +++ b/haskellAoC/inputs/2015/07 @@ -0,0 +1,339 @@ +af AND ah -> ai +NOT lk -> ll +hz RSHIFT 1 -> is +NOT go -> gp +du OR dt -> dv +x RSHIFT 5 -> aa +at OR az -> ba +eo LSHIFT 15 -> es +ci OR ct -> cu +b RSHIFT 5 -> f +fm OR fn -> fo +NOT ag -> ah +v OR w -> x +g AND i -> j +an LSHIFT 15 -> ar +1 AND cx -> cy +jq AND jw -> jy +iu RSHIFT 5 -> ix +gl AND gm -> go +NOT bw -> bx +jp RSHIFT 3 -> jr +hg AND hh -> hj +bv AND bx -> by +er OR es -> et +kl OR kr -> ks +et RSHIFT 1 -> fm +e AND f -> h +u LSHIFT 1 -> ao +he RSHIFT 1 -> hx +eg AND ei -> ej +bo AND bu -> bw +dz OR ef -> eg +dy RSHIFT 3 -> ea +gl OR gm -> gn +da LSHIFT 1 -> du +au OR av -> aw +gj OR gu -> gv +eu OR fa -> fb +lg OR lm -> ln +e OR f -> g +NOT dm -> dn +NOT l -> m +aq OR ar -> as +gj RSHIFT 5 -> gm +hm AND ho -> hp +ge LSHIFT 15 -> gi +jp RSHIFT 1 -> ki +hg OR hh -> hi +lc LSHIFT 1 -> lw +km OR kn -> ko +eq LSHIFT 1 -> fk +1 AND am -> an +gj RSHIFT 1 -> hc +aj AND al -> am +gj AND gu -> gw +ko AND kq -> kr +ha OR gz -> hb +bn OR by -> bz +iv OR jb -> jc +NOT ac -> ad +bo OR bu -> bv +d AND j -> l +bk LSHIFT 1 -> ce +de OR dk -> dl +dd RSHIFT 1 -> dw +hz AND ik -> im +NOT jd -> je +fo RSHIFT 2 -> fp +hb LSHIFT 1 -> hv +lf RSHIFT 2 -> lg +gj RSHIFT 3 -> gl +ki OR kj -> kk +NOT ak -> al +ld OR le -> lf +ci RSHIFT 3 -> ck +1 AND cc -> cd +NOT kx -> ky +fp OR fv -> fw +ev AND ew -> ey +dt LSHIFT 15 -> dx +NOT ax -> ay +bp AND bq -> bs +NOT ii -> ij +ci AND ct -> cv +iq OR ip -> ir +x RSHIFT 2 -> y +fq OR fr -> fs +bn RSHIFT 5 -> bq +0 -> c +14146 -> b +d OR j -> k +z OR aa -> ab +gf OR ge -> gg +df OR dg -> dh +NOT hj -> hk +NOT di -> dj +fj LSHIFT 15 -> fn +lf RSHIFT 1 -> ly +b AND n -> p +jq OR jw -> jx +gn AND gp -> gq +x RSHIFT 1 -> aq +ex AND ez -> fa +NOT fc -> fd +bj OR bi -> bk +as RSHIFT 5 -> av +hu LSHIFT 15 -> hy +NOT gs -> gt +fs AND fu -> fv +dh AND dj -> dk +bz AND cb -> cc +dy RSHIFT 1 -> er +hc OR hd -> he +fo OR fz -> ga +t OR s -> u +b RSHIFT 2 -> d +NOT jy -> jz +hz RSHIFT 2 -> ia +kk AND kv -> kx +ga AND gc -> gd +fl LSHIFT 1 -> gf +bn AND by -> ca +NOT hr -> hs +NOT bs -> bt +lf RSHIFT 3 -> lh +au AND av -> ax +1 AND gd -> ge +jr OR js -> jt +fw AND fy -> fz +NOT iz -> ja +c LSHIFT 1 -> t +dy RSHIFT 5 -> eb +bp OR bq -> br +NOT h -> i +1 AND ds -> dt +ab AND ad -> ae +ap LSHIFT 1 -> bj +br AND bt -> bu +NOT ca -> cb +NOT el -> em +s LSHIFT 15 -> w +gk OR gq -> gr +ff AND fh -> fi +kf LSHIFT 15 -> kj +fp AND fv -> fx +lh OR li -> lj +bn RSHIFT 3 -> bp +jp OR ka -> kb +lw OR lv -> lx +iy AND ja -> jb +dy OR ej -> ek +1 AND bh -> bi +NOT kt -> ku +ao OR an -> ap +ia AND ig -> ii +NOT ey -> ez +bn RSHIFT 1 -> cg +fk OR fj -> fl +ce OR cd -> cf +eu AND fa -> fc +kg OR kf -> kh +jr AND js -> ju +iu RSHIFT 3 -> iw +df AND dg -> di +dl AND dn -> do +la LSHIFT 15 -> le +fo RSHIFT 1 -> gh +NOT gw -> gx +NOT gb -> gc +ir LSHIFT 1 -> jl +x AND ai -> ak +he RSHIFT 5 -> hh +1 AND lu -> lv +NOT ft -> fu +gh OR gi -> gj +lf RSHIFT 5 -> li +x RSHIFT 3 -> z +b RSHIFT 3 -> e +he RSHIFT 2 -> hf +NOT fx -> fy +jt AND jv -> jw +hx OR hy -> hz +jp AND ka -> kc +fb AND fd -> fe +hz OR ik -> il +ci RSHIFT 1 -> db +fo AND fz -> gb +fq AND fr -> ft +gj RSHIFT 2 -> gk +cg OR ch -> ci +cd LSHIFT 15 -> ch +jm LSHIFT 1 -> kg +ih AND ij -> ik +fo RSHIFT 3 -> fq +fo RSHIFT 5 -> fr +1 AND fi -> fj +1 AND kz -> la +iu AND jf -> jh +cq AND cs -> ct +dv LSHIFT 1 -> ep +hf OR hl -> hm +km AND kn -> kp +de AND dk -> dm +dd RSHIFT 5 -> dg +NOT lo -> lp +NOT ju -> jv +NOT fg -> fh +cm AND co -> cp +ea AND eb -> ed +dd RSHIFT 3 -> df +gr AND gt -> gu +ep OR eo -> eq +cj AND cp -> cr +lf OR lq -> lr +gg LSHIFT 1 -> ha +et RSHIFT 2 -> eu +NOT jh -> ji +ek AND em -> en +jk LSHIFT 15 -> jo +ia OR ig -> ih +gv AND gx -> gy +et AND fe -> fg +lh AND li -> lk +1 AND io -> ip +kb AND kd -> ke +kk RSHIFT 5 -> kn +id AND if -> ig +NOT ls -> lt +dw OR dx -> dy +dd AND do -> dq +lf AND lq -> ls +NOT kc -> kd +dy AND ej -> el +1 AND ke -> kf +et OR fe -> ff +hz RSHIFT 5 -> ic +dd OR do -> dp +cj OR cp -> cq +NOT dq -> dr +kk RSHIFT 1 -> ld +jg AND ji -> jj +he OR hp -> hq +hi AND hk -> hl +dp AND dr -> ds +dz AND ef -> eh +hz RSHIFT 3 -> ib +db OR dc -> dd +hw LSHIFT 1 -> iq +he AND hp -> hr +NOT cr -> cs +lg AND lm -> lo +hv OR hu -> hw +il AND in -> io +NOT eh -> ei +gz LSHIFT 15 -> hd +gk AND gq -> gs +1 AND en -> eo +NOT kp -> kq +et RSHIFT 5 -> ew +lj AND ll -> lm +he RSHIFT 3 -> hg +et RSHIFT 3 -> ev +as AND bd -> bf +cu AND cw -> cx +jx AND jz -> ka +b OR n -> o +be AND bg -> bh +1 AND ht -> hu +1 AND gy -> gz +NOT hn -> ho +ck OR cl -> cm +ec AND ee -> ef +lv LSHIFT 15 -> lz +ks AND ku -> kv +NOT ie -> if +hf AND hl -> hn +1 AND r -> s +ib AND ic -> ie +hq AND hs -> ht +y AND ae -> ag +NOT ed -> ee +bi LSHIFT 15 -> bm +dy RSHIFT 2 -> dz +ci RSHIFT 2 -> cj +NOT bf -> bg +NOT im -> in +ev OR ew -> ex +ib OR ic -> id +bn RSHIFT 2 -> bo +dd RSHIFT 2 -> de +bl OR bm -> bn +as RSHIFT 1 -> bl +ea OR eb -> ec +ln AND lp -> lq +kk RSHIFT 3 -> km +is OR it -> iu +iu RSHIFT 2 -> iv +as OR bd -> be +ip LSHIFT 15 -> it +iw OR ix -> iy +kk RSHIFT 2 -> kl +NOT bb -> bc +ci RSHIFT 5 -> cl +ly OR lz -> ma +z AND aa -> ac +iu RSHIFT 1 -> jn +cy LSHIFT 15 -> dc +cf LSHIFT 1 -> cz +as RSHIFT 3 -> au +cz OR cy -> da +kw AND ky -> kz +lx -> a +iw AND ix -> iz +lr AND lt -> lu +jp RSHIFT 5 -> js +aw AND ay -> az +jc AND je -> jf +lb OR la -> lc +NOT cn -> co +kh LSHIFT 1 -> lb +1 AND jj -> jk +y OR ae -> af +ck AND cl -> cn +kk OR kv -> kw +NOT cv -> cw +kl AND kr -> kt +iu OR jf -> jg +at AND az -> bb +jp RSHIFT 2 -> jq +iv AND jb -> jd +jn OR jo -> jp +x OR ai -> aj +ba AND bc -> bd +jl OR jk -> jm +b RSHIFT 1 -> v +o AND q -> r +NOT p -> q +k AND m -> n +as RSHIFT 2 -> at diff --git a/haskellAoC/package.yaml b/haskellAoC/package.yaml index 94fd828..6aeccdd 100644 --- a/haskellAoC/package.yaml +++ b/haskellAoC/package.yaml @@ -22,10 +22,11 @@ description: Please see the README on GitHub at = 4.7 && < 5 - containers +- directory +- memoize +- pureMD5 - sort - split -- directory -- pureMD5 - utf8-string library: diff --git a/haskellAoC/src/Y2015/Day07.hs b/haskellAoC/src/Y2015/Day07.hs new file mode 100644 index 0000000..9f3b3bd --- /dev/null +++ b/haskellAoC/src/Y2015/Day07.hs @@ -0,0 +1,56 @@ +module Y2015.Day07 (y15day07) where + +import Debug.Trace + +import Data.Bits +import Data.Char +import Data.Function.Memoize +import Data.Int +import Data.List.Split +import qualified Data.Map as M + +type Input = String +type Output = String +type Offset = Int + +type Instruction = (Output, Wire) + +data Wire = OpAnd Input Input | + OpOr Input Input | + OpNot Input | + OpRshift Input Offset | + OpLshift Input Offset | + OpDirect Input deriving (Show) + +parseInstruction :: String -> Instruction +parseInstruction input + | len == 3 = ((parts !! 2), OpDirect (parts !! 0)) + | len == 4 = ((parts !! 3), OpNot (parts !! 1)) + | parts !! 1 == "RSHIFT" = ((parts !! 4), OpRshift (parts !! 0) (read $ parts !! 2)) + | parts !! 1 == "LSHIFT" = ((parts !! 4), OpLshift (parts !! 0) (read $ parts !! 2)) + | parts !! 1 == "AND" = ((parts !! 4), OpAnd (parts !! 0) (parts !! 2)) + | parts !! 1 == "OR" = ((parts !! 4), OpOr (parts !! 0) (parts !! 2)) + where parts = splitOn " " input + len = length parts + +getWireSignal :: M.Map Output Wire -> String -> Int +getWireSignal circuit wire = memo wire + where memo = memoize getKey + getKey k = case circuit M.! k of + OpDirect val -> getVal val + OpNot other -> complement $ getVal other + OpOr i1 i2 -> (.|.) (getVal i1) (getVal i2) + OpAnd i1 i2 -> (.&.) (getVal i1) (getVal i2) + OpLshift inp ofs -> shiftL (getVal inp) ofs + OpRshift inp ofs -> shiftR (getVal inp) ofs + getVal k + | all (isDigit) k = read k + | otherwise = memo k + +y15day07 :: [String] -> (String, String) +y15day07 input = (part1, part2) + where part1 = signalA + part2 = show $ getWireSignal instrP2 "a" + instr = M.fromList $ map parseInstruction input + signalA = show $ getWireSignal instr "a" + instrP2 = M.insert "b" (OpDirect signalA) instr diff --git a/haskellAoC/src/Y2015/Days.hs b/haskellAoC/src/Y2015/Days.hs index 61321c4..e0cda48 100644 --- a/haskellAoC/src/Y2015/Days.hs +++ b/haskellAoC/src/Y2015/Days.hs @@ -6,6 +6,7 @@ import Y2015.Day03 import Y2015.Day04 import Y2015.Day05 import Y2015.Day06 +import Y2015.Day07 year2015 :: String -> [String] -> (String, String) year2015 "01" = y15day01 @@ -14,3 +15,4 @@ year2015 "03" = y15day03 year2015 "04" = y15day04 year2015 "05" = y15day05 year2015 "06" = y15day06 +year2015 "07" = y15day07 diff --git a/haskellAoC/stack.yaml b/haskellAoC/stack.yaml index 1983f0d..82334f1 100644 --- a/haskellAoC/stack.yaml +++ b/haskellAoC/stack.yaml @@ -41,6 +41,9 @@ packages: # # extra-deps: [] +extra-deps: + - memoize-0.8.1@sha256:2146197c639c126796d850cb4457b24cfeb6966d6d878825f855aafce31f8874,1601 + # Override default flag values for local packages and extra-deps # flags: {} diff --git a/haskellAoC/stack.yaml.lock b/haskellAoC/stack.yaml.lock index 98c77e4..9a42c4c 100644 --- a/haskellAoC/stack.yaml.lock +++ b/haskellAoC/stack.yaml.lock @@ -3,7 +3,14 @@ # For more information, please see the documentation at: # https://docs.haskellstack.org/en/stable/lock_files -packages: [] +packages: +- completed: + hackage: memoize-0.8.1@sha256:2146197c639c126796d850cb4457b24cfeb6966d6d878825f855aafce31f8874,1601 + pantry-tree: + size: 473 + sha256: 598188857937054d2cc4ac91aee580944d750e91120756507891d09e02056066 + original: + hackage: memoize-0.8.1@sha256:2146197c639c126796d850cb4457b24cfeb6966d6d878825f855aafce31f8874,1601 snapshots: - completed: size: 532835