From 9351d5bc9d2405c42b1bffd6dd97b0ee60f23d9f Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 8 Dec 2020 07:19:36 +0100 Subject: [PATCH] [2020-12-08] Add solutions for day08 --- Makefile | 2 + day08/example.txt | 9 + day08/input.txt | 617 ++++++++++++++++++++++++++++++++++++++++++++++ day08/lib.go | 38 +++ day08/parse.go | 32 +++ day08/solve1.go | 9 + day08/solve2.go | 27 ++ go.mod | 2 + go.sum | 2 + main.go | 4 + 10 files changed, 742 insertions(+) create mode 100644 day08/example.txt create mode 100644 day08/input.txt create mode 100644 day08/lib.go create mode 100644 day08/parse.go create mode 100644 day08/solve1.go create mode 100644 day08/solve2.go create mode 100644 go.sum diff --git a/Makefile b/Makefile index 133c92d..4731e58 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ day07: go run main.go day07 input day08: + go run main.go day08 input + day09: day10: day11: diff --git a/day08/example.txt b/day08/example.txt new file mode 100644 index 0000000..178df53 --- /dev/null +++ b/day08/example.txt @@ -0,0 +1,9 @@ +nop +0 +acc +1 +jmp +4 +acc +3 +jmp -3 +acc -99 +acc +1 +jmp -4 +acc +6 diff --git a/day08/input.txt b/day08/input.txt new file mode 100644 index 0000000..89fcd1c --- /dev/null +++ b/day08/input.txt @@ -0,0 +1,617 @@ +acc -5 +nop +333 +acc +45 +jmp +288 +acc -9 +jmp +1 +acc +27 +jmp +464 +acc +34 +jmp +478 +jmp +356 +acc +10 +acc +20 +acc +29 +acc -10 +jmp +359 +acc +29 +acc +31 +acc +36 +acc +42 +jmp +502 +acc +14 +jmp +45 +jmp +499 +acc -19 +acc +4 +acc +24 +nop +460 +jmp +465 +acc +29 +acc +6 +acc +25 +jmp +355 +acc -10 +acc +50 +jmp -27 +acc +46 +acc +2 +acc -18 +acc +8 +jmp +85 +nop +264 +acc +44 +jmp +310 +acc +23 +acc -15 +acc -12 +jmp +290 +acc -5 +acc +4 +acc -7 +jmp +248 +acc +23 +jmp +434 +nop -6 +jmp +239 +jmp +1 +acc -19 +jmp +67 +acc +40 +acc +21 +acc +24 +jmp +366 +acc +38 +acc +15 +acc -2 +jmp +542 +acc +27 +acc +21 +acc +44 +acc +31 +jmp -60 +jmp -51 +acc +14 +jmp +254 +acc +43 +acc -3 +acc +30 +jmp -5 +acc +12 +jmp +330 +acc +4 +jmp +81 +nop +107 +acc -12 +nop +98 +jmp +467 +jmp +111 +acc +0 +acc +48 +acc -4 +jmp +184 +jmp +310 +acc +5 +acc +1 +acc +49 +jmp +477 +jmp +279 +acc +12 +acc -7 +nop +51 +jmp +125 +jmp +1 +acc -6 +acc -19 +acc -10 +jmp +109 +acc +28 +acc +4 +jmp +422 +acc +12 +jmp +152 +jmp -71 +acc -8 +nop +252 +nop +303 +jmp -4 +acc +1 +jmp +200 +acc -2 +jmp +453 +jmp +443 +acc +5 +acc -18 +jmp +304 +jmp +414 +acc +15 +jmp +271 +acc +22 +jmp +371 +acc +29 +acc +29 +acc -17 +jmp +166 +jmp +49 +acc -4 +acc -6 +jmp +461 +acc +21 +acc +49 +jmp +458 +acc +27 +acc +3 +acc -12 +jmp +7 +jmp +216 +nop +385 +acc +0 +acc +11 +acc +13 +jmp +343 +nop +273 +acc +38 +acc -2 +jmp +61 +nop +8 +jmp +135 +acc +13 +acc +46 +jmp +239 +acc +38 +acc +6 +jmp +225 +nop +337 +jmp +66 +acc +49 +acc +10 +jmp +167 +acc -18 +acc +32 +jmp +107 +nop +195 +acc +39 +jmp +391 +acc +13 +jmp +227 +jmp +71 +nop +340 +acc +30 +jmp +19 +acc +42 +acc +34 +jmp +349 +acc +46 +jmp -130 +nop +383 +acc +45 +acc -17 +acc +13 +jmp +354 +acc +39 +acc +26 +nop +55 +jmp -100 +acc -16 +acc +13 +acc -1 +jmp +395 +acc +33 +nop +106 +acc -14 +acc -7 +jmp -74 +acc +0 +acc -8 +jmp -28 +nop +265 +acc +27 +acc +30 +acc +23 +jmp -112 +acc +22 +acc +7 +acc +2 +jmp +71 +acc -6 +acc +15 +nop -89 +acc +24 +jmp +92 +jmp +353 +jmp -104 +acc +19 +acc +12 +acc +12 +jmp -132 +acc +20 +acc +27 +jmp -60 +jmp -170 +acc +13 +acc +15 +jmp +114 +acc +3 +acc +13 +acc -16 +acc +50 +jmp +124 +acc +28 +acc -10 +acc +0 +acc +21 +jmp +192 +acc +2 +acc +17 +acc +18 +jmp +318 +acc +41 +acc +34 +acc +0 +acc -5 +jmp +17 +nop -131 +acc +29 +acc +46 +nop +238 +jmp +172 +jmp +1 +acc +14 +acc +32 +acc -15 +jmp +331 +jmp +209 +jmp +189 +acc +1 +nop +163 +acc +46 +jmp -77 +acc +0 +jmp -131 +acc +21 +acc +8 +acc +26 +acc +12 +jmp +72 +jmp +258 +jmp +183 +acc +17 +acc -12 +acc +15 +jmp +5 +nop +85 +acc +23 +acc +40 +jmp +53 +acc +24 +jmp +257 +acc -10 +acc +34 +acc +49 +jmp -178 +acc +28 +jmp +164 +jmp +250 +acc -14 +acc +32 +acc +13 +jmp +96 +jmp -290 +acc -19 +jmp -276 +acc -15 +nop +271 +acc -16 +jmp +264 +acc +36 +jmp -172 +acc -11 +acc +33 +nop -261 +jmp +77 +nop +70 +acc +6 +nop -98 +acc +8 +jmp -158 +acc +37 +jmp +17 +acc -2 +acc -13 +jmp -52 +acc -9 +jmp -116 +acc +18 +acc +9 +acc -12 +jmp +8 +jmp +226 +jmp +284 +acc -2 +nop +44 +nop -320 +nop -259 +jmp -312 +jmp -286 +acc +18 +jmp +224 +acc +46 +acc +29 +jmp +1 +acc +18 +jmp +123 +acc +31 +nop -209 +nop -39 +jmp -171 +acc -12 +jmp -53 +acc +19 +acc +42 +nop -317 +acc -6 +jmp -122 +jmp -90 +jmp +1 +jmp -248 +acc +0 +jmp -34 +acc +33 +acc -8 +jmp -312 +acc +47 +acc -10 +acc -4 +jmp -281 +jmp +106 +acc -17 +acc +0 +acc +17 +nop +229 +jmp +54 +acc +31 +acc +23 +jmp -88 +jmp -301 +jmp +105 +jmp -264 +acc -9 +acc -17 +acc +25 +jmp +120 +jmp -274 +jmp +140 +nop +35 +jmp -146 +acc +31 +jmp -63 +acc +14 +acc +45 +acc +48 +acc +7 +jmp -246 +jmp +108 +acc +18 +acc -8 +jmp -12 +acc +6 +jmp +163 +nop -80 +nop -340 +jmp -63 +jmp -126 +acc +26 +acc +6 +acc +5 +acc -2 +jmp +111 +acc +47 +acc +20 +jmp +39 +acc +38 +acc +3 +acc -13 +acc +27 +jmp -263 +nop +9 +acc +50 +jmp -149 +acc -18 +jmp -245 +acc +2 +acc +40 +acc -4 +jmp -302 +acc +10 +acc +20 +jmp -220 +jmp -93 +nop +43 +acc -18 +acc +6 +jmp +1 +jmp -307 +jmp +75 +jmp -177 +acc +8 +acc +31 +acc +47 +jmp -321 +acc +22 +jmp +1 +acc +9 +acc +32 +jmp -56 +acc -13 +nop -140 +acc +24 +jmp -368 +jmp -285 +acc +38 +acc +32 +jmp +1 +jmp -205 +acc +47 +acc +21 +jmp -304 +jmp -17 +acc +9 +jmp -399 +nop -233 +acc +18 +jmp -63 +acc +45 +jmp -335 +acc +35 +acc +9 +acc -12 +jmp -19 +acc +8 +acc +48 +jmp -179 +acc +37 +acc +15 +jmp -182 +acc +2 +acc +22 +acc +7 +jmp -271 +jmp -288 +jmp -345 +acc +21 +nop -107 +acc +17 +jmp -462 +acc +41 +jmp +1 +jmp -158 +nop -310 +acc +38 +nop +28 +acc +24 +jmp -32 +jmp -375 +acc +20 +acc +15 +acc +11 +acc -3 +jmp -186 +acc -15 +jmp -40 +acc +38 +acc +27 +acc +50 +acc +8 +jmp -406 +acc +15 +acc +39 +jmp -409 +nop -396 +acc -14 +acc -5 +jmp -40 +nop -156 +acc +3 +acc -3 +acc +22 +jmp -16 +acc +9 +jmp +68 +nop -109 +acc +18 +jmp -198 +nop -455 +nop -195 +jmp +1 +nop -3 +jmp -46 +acc +40 +acc +26 +acc +47 +jmp -509 +jmp -92 +jmp -166 +nop -335 +acc +6 +acc +1 +acc +28 +jmp +44 +jmp -79 +acc -18 +acc +13 +jmp -10 +jmp +66 +acc +29 +acc +34 +jmp +1 +acc +44 +jmp -129 +acc -5 +acc +41 +acc +48 +acc +28 +jmp +16 +acc -1 +acc +30 +acc -4 +jmp +52 +acc +1 +acc +37 +jmp -312 +acc +14 +nop -340 +jmp -341 +jmp -55 +nop -366 +acc +14 +jmp -185 +jmp -450 +acc -4 +acc -4 +acc +37 +jmp -93 +jmp -170 +jmp +1 +acc -13 +acc +47 +acc +29 +jmp -456 +acc -12 +acc -9 +jmp -397 +acc -11 +acc +6 +jmp -207 +acc +18 +jmp -387 +nop -268 +acc +40 +acc +26 +jmp -21 +acc +47 +jmp -91 +acc -15 +jmp -227 +nop -466 +acc +4 +acc -19 +jmp -231 +acc +29 +acc +15 +acc +0 +acc +35 +jmp -303 +acc +28 +acc +36 +acc +34 +acc -11 +jmp -168 +acc +48 +jmp -521 +acc +28 +jmp -25 +acc +47 +acc +16 +acc -13 +acc +11 +jmp +1 diff --git a/day08/lib.go b/day08/lib.go new file mode 100644 index 0000000..b00f07d --- /dev/null +++ b/day08/lib.go @@ -0,0 +1,38 @@ +package day08 + +func runProgram(rows []Operation, useLog bool) int { + // Log of pos => accumulators executed + runlog := make(map[int]int) + + pos := 0 + acc := 1 // Start accumulator one above than it should be + for true { + if pos >= len(rows) { + break + } + + // Otherwise the if here doesn't work + if runlog[pos] > 0 { + if useLog { + break + } else { + return 0 + } + } + + runlog[pos] = acc + + switch rows[pos].Operation { + case "acc": + acc += rows[pos].Argument + case "jmp": + pos += rows[pos].Argument - 1 + case "nop": + } + + pos++ + } + + // And substract the accumulator here + return acc - 1 +} diff --git a/day08/parse.go b/day08/parse.go new file mode 100644 index 0000000..e9544e8 --- /dev/null +++ b/day08/parse.go @@ -0,0 +1,32 @@ +package day08 + +import ( + "regexp" + "strconv" + + "git.elis.nu/etu/aoc2020/utils" +) + +type Operation struct { + Operation string + Argument int +} + +var rows []Operation + +func ParseFile(input string) { + // Parse file + for _, line := range utils.GetLinesFromFile("day08/" + input + ".txt") { + re := regexp.MustCompile(`^(\w+) (.\d+)$`) + + matches := re.FindStringSubmatch(line) + + arg, _ := strconv.Atoi(matches[2]) + + rows = append(rows, Operation{ + Operation: matches[1], + Argument: arg, + }) + + } +} diff --git a/day08/solve1.go b/day08/solve1.go new file mode 100644 index 0000000..e55e84d --- /dev/null +++ b/day08/solve1.go @@ -0,0 +1,9 @@ +package day08 + +import ( + "log" +) + +func Solve1() { + log.Printf("2020-12-08.01: Answer: %d\n", runProgram(rows, true)) +} diff --git a/day08/solve2.go b/day08/solve2.go new file mode 100644 index 0000000..d3a750a --- /dev/null +++ b/day08/solve2.go @@ -0,0 +1,27 @@ +package day08 + +import ( + "log" + + "github.com/jinzhu/copier" +) + +func Solve2() { + for key, row := range rows { + var myRows []Operation + + copier.Copy(&myRows, &rows) + + if row.Operation == "jmp" { + myRows[key].Operation = "nop" + } else if row.Operation == "nop" { + myRows[key].Operation = "jmp" + } + + if result := runProgram(myRows, false); result > 0 { + log.Printf("2020-12-08.02: Answer: %d\n", result) + + break + } + } +} diff --git a/go.mod b/go.mod index 51700dd..4bae379 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,5 @@ module git.elis.nu/etu/aoc2020 go 1.15 + +require github.com/jinzhu/copier v0.1.0 diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..70d7b53 --- /dev/null +++ b/go.sum @@ -0,0 +1,2 @@ +github.com/jinzhu/copier v0.1.0 h1:Vh8xALtH3rrKGB/XIRe5d0yCTHPZFauWPLvdpDAbi88= +github.com/jinzhu/copier v0.1.0/go.mod h1:24xnZezI2Yqac9J61UC6/dG/k76ttpq0DdJI3QmUvro= diff --git a/main.go b/main.go index 65d8c04..619d536 100644 --- a/main.go +++ b/main.go @@ -11,6 +11,7 @@ import ( "git.elis.nu/etu/aoc2020/day05" "git.elis.nu/etu/aoc2020/day06" "git.elis.nu/etu/aoc2020/day07" + "git.elis.nu/etu/aoc2020/day08" "git.elis.nu/etu/aoc2020/utils" ) @@ -40,5 +41,8 @@ func main() { case "day07": utils.Perf("2020-12-07", day07.ParseFile, day07.Solve1, day07.Solve2) + + case "day08": + utils.Perf("2020-12-08", day08.ParseFile, day08.Solve1, day08.Solve2) } }