Some improvements and moved to shared code

Author: jvgrootveld

2022/src/main/kotlin/day05/Day05.kt

@@ -1,13 +1,12 @@
 package day05
 
+import shared.extractInts
 import java.util.*
 
 class Day05 {
 
     companion object {
 
-        private val MATCH_NUMBERS = Regex("[0-9]+")
-
         enum class CraneType {
             CRATE_MOVER_9000,
             CRATE_MOVER_9001
@@ -71,10 +70,7 @@ class Day05 {
 
         private fun parseInstructions(input: String): List<Instruction> {
             return input.split("\n").map {
-                val (move, from, to) = MATCH_NUMBERS.findAll(it)
-                    .map(MatchResult::value)
-                    .map(String::toInt)
-                    .toList()
+                val (move, from, to) = it.extractInts()
 
                 Instruction(move, from - 1, to - 1)
             }

2022/src/main/kotlin/day11/Day11.kt

@@ -1,33 +1,33 @@
 package day11
 
+import shared.extractLongs
 import java.lang.RuntimeException
 import java.util.LinkedList
 
 class Day11 {
 
     companion object {
 
-        private val MATCH_NUMBERS = Regex("[0-9]+")
-
         fun part1(input: String): Long {
             val monkeys = parseInput(input).associateBy(Monkey::id)
-            return startGame(monkeys, 20, 3)
+            return startGame(monkeys, 20) { it / 3 }
         }
 
         fun part2(input: String): Long {
             val monkeys = parseInput(input).associateBy(Monkey::id)
-            return startGame(monkeys, 10_000, 1)
-        }
 
-        private fun startGame(monkeys: Map<Int, Monkey>, rounds: Int, reliefModifier: Int): Long {
-           val commonDenominator = monkeys.values
-               .map(Monkey::divisibleValue)
-               .reduce { acc, v -> acc * v  }
+            val commonDenominator = monkeys.values
+                .map(Monkey::divisibleValue)
+                .reduce { acc, v -> acc * v }
+
+            return startGame(monkeys, 10_000) { it % commonDenominator }
+        }
 
+        private fun startGame(monkeys: Map<Int, Monkey>, rounds: Int, reliefOperation: ReliefOperation): Long {
             for (round in 1..rounds) {
                 monkeys.forEach { (_, monkey) ->
                     monkey.items.forEach { item ->
-                        val newWorryLevel = (monkey.inspectItem(item) / reliefModifier) % commonDenominator
+                        val newWorryLevel = reliefOperation(monkey.inspectItem(item))
                         val newMonkeyId = monkey.chooseTargetMonkey(newWorryLevel)
 
                         monkeys[newMonkeyId]?.items?.add(newWorryLevel)
@@ -73,7 +73,8 @@ class Day11 {
             input.split("\n\n").mapIndexed { i, value ->
                 val lines = value.split("\n").map(String::trimIndent)
 
-                val items = parseItems(lines[1])
+                // Parse: Starting items: 79, 98
+                val items = lines[1].extractLongs()
                 val operation = parseOperation(lines[2])
                 val test = parseTest(lines[3], lines[4], lines[5])
                 val divisibleValue = lines[3].split(" ").last().toInt()
@@ -84,13 +85,6 @@ class Day11 {
             return monkeys
         }
 
-        // Parse: Starting items: 79, 98
-        private fun parseItems(input: String): List<Long> {
-            return MATCH_NUMBERS.findAll(input).map {
-                it.value.toLong()
-            }.toList()
-        }
-
         // Parse: Operation: new = old * 19
         private fun parseOperation(input: String): MonkeyOperation {
             val parts = input.split(" ")
@@ -138,4 +132,5 @@ class Day11 {
 }
 
 typealias MonkeyOperation = (value: Long) -> Long
-typealias MonkeyTest = (value: Long) -> Int
+typealias MonkeyTest = (value: Long) -> Int
+typealias ReliefOperation = (value: Long) -> Long

2022/src/main/kotlin/shared/StringExtensions.kt

@@ -0,0 +1,15 @@
+package shared
+
+private val MATCH_NUMBERS = Regex("[0-9]+")
+
+fun String.extractInts(): List<Int> {
+    return MATCH_NUMBERS.findAll(this).map {
+        it.value.toInt()
+    }.toList()
+}
+
+fun String.extractLongs(): List<Long> {
+    return MATCH_NUMBERS.findAll(this).map {
+        it.value.toLong()
+    }.toList()
+}