Prepare for 2022

build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
-    kotlin("jvm") version "1.6.0"
+    kotlin("jvm") version "1.7.22"
 }
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-RC3")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
 }
 tasks {
     sourceSets {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -1 +1 @@
-rootProject.name = "advent-of-code-2021"
+rootProject.name = "advent-of-code"

src/Utils.kt

@@ -13,7 +13,7 @@ import kotlin.time.measureTime
 /**
  * Reads lines from the given input txt file.
  */
-fun readInput(name: String) = File("src", "$name.txt").readLines()
+fun readInput(year: Int, name: String) = File("src/year$year", "$name.txt").readLines()
 
 /**
  * Converts string to md5 hash.

src/Day01.kt → src/year2021/Day01.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
 
     fun toInts(input: List<String>) = input.map { it.toInt() }
@@ -16,11 +21,11 @@ fun main() {
     }
 
     // test if implementation meets criteria from the description, like:
-    val testInput = readInput("Day01_test")
+    val testInput = readInput(2021, "Day01_test")
     check(part1(testInput) == 7)
     check(part2(testInput) == 5)
 
-    val input = readInput("Day01")
+    val input = readInput(2021, "Day01")
     println(part1(input))
     println(part2(input))
 

src/Day02.kt → src/year2021/Day02.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
 
     fun part1(input: List<String>): Int {
@@ -31,11 +36,11 @@ fun main() {
         return horizontal * vertical
     }
 
-    val testInput = readInput("Day02_test")
+    val testInput = readInput(2021, "Day02_test")
     check(part1(testInput) == 150)
     check(part2(testInput) == 900)
 
-    val input = readInput("Day02")
+    val input = readInput(2021, "Day02")
     println(part1(input))
     println(part2(input))
 

src/Day03.kt → src/year2021/Day03.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
 
     fun toMeasurements(input: List<String>) = input
@@ -60,11 +65,11 @@ fun main() {
         return o2GeneratorRating * co2ScrubberRating
     }
 
-    val testInput = readInput("Day03_test")
+    val testInput = readInput(2021, "Day03_test")
     check(part1(testInput) == 198)
     check(part2(testInput) == 230)
 
-    val input = readInput("Day03")
+    val input = readInput(2021, "Day03")
     println(part1(input))
     println(part2(input))
 

src/Day04.kt → src/year2021/Day04.kt

@@ -1,3 +1,9 @@
+package year2021
+
+import SHOULD_NOT_REACH
+import benchmark
+import readInput
+
 private class BingoBoard(val numbers: Array<Int>) {
     init {
         check(numbers.size == 25)
@@ -59,10 +65,10 @@ fun main() {
         SHOULD_NOT_REACH()
     }
 
-    val testInput = readInput("Day04_test")
+    val testInput = readInput(2021, "Day04_test")
     check(part1(testInput) == 4512)
 
-    val input = readInput("Day04")
+    val input = readInput(2021, "Day04")
     println(part1(input))
 
     check(part2(testInput) == 1924)

src/Day05.kt → src/year2021/Day05.kt

@@ -1,3 +1,7 @@
+package year2021
+
+import benchmark
+import readInput
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.sign
@@ -33,7 +37,7 @@ private class Line(val start: Position, val end: Position) {
     }
 }
 
-private fun List<String>.solution(ordinalDirectionsOnly: Boolean): Int = map(Line::from)
+private fun List<String>.solution(ordinalDirectionsOnly: Boolean): Int = map(Line.Companion::from)
     .flatMap { it.positions(ordinalDirectionsOnly) }
     .groupingBy { it }
     .eachCount()
@@ -49,10 +53,10 @@ fun main() {
         return input.solution(false)
     }
 
-    val testInput = readInput("Day05_test")
+    val testInput = readInput(2021, "Day05_test")
     check(part1(testInput) == 5)
 
-    val input = readInput("Day05")
+    val input = readInput(2021, "Day05")
     println(part1(input))
 
     check(part2(testInput) == 12)

src/Day06.kt → src/year2021/Day06.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
     fun tick(input: LongArray): LongArray {
         check(input.size == 9) { "Input size should be 9" }
@@ -27,10 +32,10 @@ fun main() {
         return solution(input, 256)
     }
 
-    val testInput = readInput("Day06_test")
+    val testInput = readInput(2021, "Day06_test")
     check(part1(testInput) == 5_934L)
 
-    val input = readInput("Day06")
+    val input = readInput(2021, "Day06")
     println(part1(input))
 
     check(part2(testInput) == 26_984_457_539L)

src/Day07.kt → src/year2021/Day07.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import middle
+import readInput
 import kotlin.math.absoluteValue
 
 fun main() {
@@ -36,10 +41,10 @@ fun main() {
         return solution(positions, positions.average().toInt()) { it * (it + 1) / 2 }
     }
 
-    val testInput = readInput("Day07_test")
+    val testInput = readInput(2021, "Day07_test")
     check(part1(testInput) == 37)
 
-    val input = readInput("Day07")
+    val input = readInput(2021, "Day07")
     println(part1(input))
 
     check(part2(testInput) == 168)

src/Day08.kt → src/year2021/Day08.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 private data class PuzzleEntry(val patterns: List<String>, val output: List<String>)
 
 private fun String.toBits() =
@@ -86,10 +91,10 @@ fun main() {
             .map { it to Decoder(it.patterns) }
             .sumOf { (entry, decoder) -> decoder.decode(entry.output) }
 
-    val testInput = readInput("Day08_test")
+    val testInput = readInput(2021, "Day08_test")
     check(part1(testInput) == 26)
 
-    val input = readInput("Day08")
+    val input = readInput(2021, "Day08")
     println(part1(input))
 
     check(part2(testInput) == 61229)

src/Day09.kt → src/year2021/Day09.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 private typealias HeightMap = Array<Array<Int>>
 
 
@@ -67,10 +72,10 @@ fun main() {
             .take(3).reduce { a, b -> a * b }
     }
 
-    val testInput = readInput("Day09_test")
+    val testInput = readInput(2021, "Day09_test")
     check(part1(testInput) == 15)
 
-    val input = readInput("Day09")
+    val input = readInput(2021, "Day09")
     println(part1(input))
 
     check(part2(testInput) == 1134)

src/Day10.kt → src/year2021/Day10.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
 
     class Parser constructor(val input: String) {
@@ -66,10 +71,10 @@ fun main() {
         return scores[scores.size / 2]
     }
 
-    val testInput = readInput("Day10_test")
+    val testInput = readInput(2021, "Day10_test")
     check(part1(testInput) == 26397)
 
-    val input = readInput("Day10")
+    val input = readInput(2021, "Day10")
     println(part1(input))
 
     check(part2(testInput) == 288957L)

src/Day11.kt → src/year2021/Day11.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
 
     fun step(energyLevels: IntArray): IntArray {
@@ -51,10 +56,10 @@ fun main() {
             .count() //with the initial state, the count is the expected value
     }
 
-    val testInput = readInput("Day11_test")
+    val testInput = readInput(2021, "Day11_test")
     check(part1(testInput) == 1656)
 
-    val input = readInput("Day11")
+    val input = readInput(2021, "Day11")
     println(part1(input))
 
     check(part2(testInput) == 195)

src/Day12.kt → src/year2021/Day12.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
 
     fun isSmall(id: String) = id.all { it.isLowerCase() }
@@ -47,14 +52,14 @@ fun main() {
         }.size
     }
 
-    val testInput1 = readInput("Day12_test1")
-    val testInput2 = readInput("Day12_test2")
-    val testInput3 = readInput("Day12_test3")
+    val testInput1 = readInput(2021, "Day12_test1")
+    val testInput2 = readInput(2021, "Day12_test2")
+    val testInput3 = readInput(2021, "Day12_test3")
     check(part1(testInput1) == 10)
     check(part1(testInput2) == 19)
     check(part1(testInput3) == 226)
 
-    val input = readInput("Day12")
+    val input = readInput(2021, "Day12")
     println(part1(input))
 
     check(part2(testInput1) == 36)

src/Day13.kt → src/year2021/Day13.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
     class FoldInstruction(val x: Int? = null, val y: Int? = null) {
         fun transform(positions: Set<Pair<Int, Int>>): Set<Pair<Int, Int>> =
@@ -74,10 +79,10 @@ fun main() {
         return result.count()
     }
 
-    val testInput = readInput("Day13_test")
+    val testInput = readInput(2021, "Day13_test")
     check(part1(testInput) == 17)
 
-    val input = readInput("Day13")
+    val input = readInput(2021, "Day13")
     println(part1(input))
 
     check(part2("TEST", testInput) == 16)

src/Day14.kt → src/year2021/Day14.kt

@@ -1,3 +1,8 @@
+package year2021
+
+import benchmark
+import readInput
+
 fun main() {
 
     class Polymer(val start: Char, val end: Char, val pairCounts: Map<String, Long>) {
@@ -59,10 +64,10 @@ fun main() {
         return solution(input, 40)
     }
 
-    val testInput = readInput("Day14_test")
+    val testInput = readInput(2021, "Day14_test")
     check(part1(testInput) == 1588L)
 
-    val input = readInput("Day14")
+    val input = readInput(2021, "Day14")
     println(part1(input))
     check(part2(testInput) == 2188189693529L)
     println(part2(input))

src/Day15.kt → src/year2021/Day15.kt

@@ -1,3 +1,9 @@
+package year2021
+
+import SHOULD_NOT_REACH
+import benchmark
+import crossJoin
+import readInput
 import java.util.*
 
 fun main() {
@@ -66,10 +72,10 @@ fun main() {
         return solution(input, 5)
     }
 
-    val testInput = readInput("Day15_test")
+    val testInput = readInput(2021, "Day15_test")
     check(part1(testInput) == 40)
 
-    val input = readInput("Day15")
+    val input = readInput(2021, "Day15")
     println(part1(input))
 
     check(part2(testInput) == 315)