Introduce some packages for the extensions

rhaendel · rhaendel · commit 74e54ad37625 · 2025-07-11T11:18:10.000+02:00
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/Hashing.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/Hashing.kt
@@ -1,6 +1,5 @@
 package de.ronny_h.aoc.extensions
 
-import java.math.BigInteger
 import java.security.MessageDigest
 
 private val messageDigest = MessageDigest.getInstance("MD5")
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/graphs/ShortestPath.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/graphs/ShortestPath.kt
@@ -1,4 +1,4 @@
-package de.ronny_h.aoc.extensions
+package de.ronny_h.aoc.extensions.graphs
 
 import java.util.PriorityQueue
 import kotlin.Int.Companion.MAX_VALUE
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/graphs/ShortestPaths.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/graphs/ShortestPaths.kt
@@ -1,4 +1,4 @@
-package de.ronny_h.aoc.extensions
+package de.ronny_h.aoc.extensions.graphs
 
 import java.util.*
 import kotlin.Int.Companion.MAX_VALUE
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/grids/Coordinates.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/grids/Coordinates.kt
@@ -1,4 +1,4 @@
-package de.ronny_h.aoc.extensions
+package de.ronny_h.aoc.extensions.grids
 
 import kotlin.math.abs
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/grids/Grid.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/grids/Grid.kt
@@ -1,9 +1,8 @@
-package de.ronny_h.aoc.extensions
+package de.ronny_h.aoc.extensions.grids
 
 import java.io.ByteArrayOutputStream
 import java.io.PrintStream
 import java.nio.charset.StandardCharsets
-import kotlin.collections.MutableList
 
 /**
  * @param nullElement The initial element within the grid
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/grids/SimpleCharGrid.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/grids/SimpleCharGrid.kt
@@ -1,4 +1,7 @@
-package de.ronny_h.aoc.extensions
+package de.ronny_h.aoc.extensions.grids
+
+import de.ronny_h.aoc.extensions.graphs.ShortestPath
+import de.ronny_h.aoc.extensions.graphs.aStarAllPaths
 
 open class SimpleCharGrid(input: List<String>, nullElement: Char = '#') : Grid<Char>(input, nullElement) {
     override fun Char.toElementType() = this
@@ -20,4 +23,4 @@ open class SimpleCharGrid(input: List<String>, nullElement: Char = '#') : Grid<C
 
         return aStarAllPaths(start, { this == goal }, neighbours, d, h)
     }
-}
+}
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/numbers/Digits.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/numbers/Digits.kt
@@ -1,4 +1,4 @@
-package de.ronny_h.aoc.extensions
+package de.ronny_h.aoc.extensions.numbers
 
 import kotlin.math.abs
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/extensions/numbers/IntegralNumbers.kt b/src/main/kotlin/de/ronny_h/aoc/extensions/numbers/IntegralNumbers.kt
@@ -1,4 +1,4 @@
-package de.ronny_h.aoc.extensions
+package de.ronny_h.aoc.extensions.numbers
 
 import kotlin.math.floor
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2015/day03/PerfectlySphericalHouses.kt b/src/main/kotlin/de/ronny_h/aoc/year2015/day03/PerfectlySphericalHouses.kt
@@ -1,8 +1,8 @@
 package de.ronny_h.aoc.year2015.day03
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Direction
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
 
 fun main() = PerfectlySphericalHouses().run(2592, 2360)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2015/day06/FireHazard.kt b/src/main/kotlin/de/ronny_h/aoc/year2015/day06/FireHazard.kt
@@ -1,7 +1,7 @@
 package de.ronny_h.aoc.year2015.day06
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
+import de.ronny_h.aoc.extensions.grids.Coordinates
 import de.ronny_h.aoc.year2015.day06.Action.OFF
 import de.ronny_h.aoc.year2015.day06.Action.ON
 import de.ronny_h.aoc.year2015.day06.Action.TOGGLE
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2015/day07/SomeAssemblyRequired.kt b/src/main/kotlin/de/ronny_h/aoc/year2015/day07/SomeAssemblyRequired.kt
@@ -1,7 +1,7 @@
 package de.ronny_h.aoc.year2015.day07
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.isInt
+import de.ronny_h.aoc.extensions.numbers.isInt
 import de.ronny_h.aoc.year2015.day07.Operator.BinaryOperator
 import de.ronny_h.aoc.year2015.day07.Operator.UnaryOperator
 import de.ronny_h.aoc.year2015.day07.OperatorOutput.NoSignal
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2016/day01/NoTimeForATaxicab.kt b/src/main/kotlin/de/ronny_h/aoc/year2016/day01/NoTimeForATaxicab.kt
@@ -1,9 +1,9 @@
 package de.ronny_h.aoc.year2016.day01
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Coordinates.Companion.ZERO
-import de.ronny_h.aoc.extensions.Direction.NORTH
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Coordinates.Companion.ZERO
+import de.ronny_h.aoc.extensions.grids.Direction.NORTH
 
 fun main() = NoTimeForATaxicab().run(239, 141)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day04/CeresSearch.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day04/CeresSearch.kt
@@ -1,7 +1,7 @@
 package de.ronny_h.aoc.year2024.day04
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Grid
+import de.ronny_h.aoc.extensions.grids.Grid
 
 fun main() = CeresSearch().run(2500, 1933)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day06/GuardGallivant.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day06/GuardGallivant.kt
@@ -1,10 +1,10 @@
 package de.ronny_h.aoc.year2024.day06
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Direction
-import de.ronny_h.aoc.extensions.Direction.NORTH
-import de.ronny_h.aoc.extensions.Grid
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Direction.NORTH
+import de.ronny_h.aoc.extensions.grids.Grid
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.produce
 import java.lang.Runtime.getRuntime
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day08/ResonantCollinearity.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day08/ResonantCollinearity.kt
@@ -1,8 +1,8 @@
 package de.ronny_h.aoc.year2024.day08
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Grid
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Grid
 import de.ronny_h.aoc.extensions.combinations
 
 fun main() = ResonantCollinearity().run(214, 809)
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day10/HoofIt.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day10/HoofIt.kt
@@ -1,9 +1,9 @@
 package de.ronny_h.aoc.year2024.day10
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Direction
-import de.ronny_h.aoc.extensions.Grid
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Grid
 
 fun main() = HoofIt().run(816, 1960)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day11/PlutonianPebbles.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day11/PlutonianPebbles.kt
@@ -1,7 +1,7 @@
 package de.ronny_h.aoc.year2024.day11
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.digitCount
+import de.ronny_h.aoc.extensions.numbers.digitCount
 import de.ronny_h.aoc.extensions.memoize
 
 fun main() = PlutonianPebbles().run(193899, 229682160383225)
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day12/GardenGroups.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day12/GardenGroups.kt
@@ -1,10 +1,10 @@
 package de.ronny_h.aoc.year2024.day12
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Direction
-import de.ronny_h.aoc.extensions.Direction.NORTH
-import de.ronny_h.aoc.extensions.Grid
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Direction.NORTH
+import de.ronny_h.aoc.extensions.grids.Grid
 
 const val verbose = false
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day13/ClawContraption.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day13/ClawContraption.kt
@@ -1,7 +1,7 @@
 package de.ronny_h.aoc.year2024.day13
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.isIntegral
+import de.ronny_h.aoc.extensions.numbers.isIntegral
 
 fun main() = ClawContraption().run(33427, 91649162972270)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day15/NormalWarehouse.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day15/NormalWarehouse.kt
@@ -1,7 +1,7 @@
 package de.ronny_h.aoc.year2024.day15
 
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Direction
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
 
 fun List<String>.warehouseInput(): List<String> = takeWhile { it.isNotBlank() }
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day15/WarehouseWoes.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day15/WarehouseWoes.kt
@@ -1,9 +1,9 @@
 package de.ronny_h.aoc.year2024.day15
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Direction
-import de.ronny_h.aoc.extensions.Grid
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Grid
 
 fun main() = WarehouseWoes().run(1463715, 1481392)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day15/WideWarehouse.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day15/WideWarehouse.kt
@@ -1,9 +1,9 @@
 package de.ronny_h.aoc.year2024.day15
 
-import de.ronny_h.aoc.extensions.Coordinates
-import de.ronny_h.aoc.extensions.Direction
-import de.ronny_h.aoc.extensions.Direction.EAST
-import de.ronny_h.aoc.extensions.Direction.WEST
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Direction.EAST
+import de.ronny_h.aoc.extensions.grids.Direction.WEST
 import kotlin.collections.iterator
 
 fun List<String>.widenedWarehouseInput(): List<String> = takeWhile { it.isNotBlank() }
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day16/ReindeerMazeGrid.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day16/ReindeerMazeGrid.kt
@@ -1,7 +1,11 @@
 package de.ronny_h.aoc.year2024.day16
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.*
+import de.ronny_h.aoc.extensions.graphs.ShortestPath
+import de.ronny_h.aoc.extensions.graphs.aStarAllPaths
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Grid
 
 fun main() = ReindeerMaze().run(89460, 504)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day18/RAMRun.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day18/RAMRun.kt
@@ -1,7 +1,11 @@
 package de.ronny_h.aoc.year2024.day18
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.*
+import de.ronny_h.aoc.extensions.graphs.ShortestPath
+import de.ronny_h.aoc.extensions.graphs.aStar
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Grid
 
 fun main() = RAMRun().run("416", "50,23")
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day20/RaceCondition.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day20/RaceCondition.kt
@@ -1,7 +1,11 @@
 package de.ronny_h.aoc.year2024.day20
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.*
+import de.ronny_h.aoc.extensions.graphs.ShortestPath
+import de.ronny_h.aoc.extensions.graphs.aStar
+import de.ronny_h.aoc.extensions.grids.Coordinates
+import de.ronny_h.aoc.extensions.grids.Direction
+import de.ronny_h.aoc.extensions.grids.Grid
 
 fun main() = RaceCondition().run(1438, 1026446)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day21/KeypadConundrum.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day21/KeypadConundrum.kt
@@ -1,9 +1,8 @@
 package de.ronny_h.aoc.year2024.day21
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.Direction
-import de.ronny_h.aoc.extensions.Direction.*
-import de.ronny_h.aoc.extensions.SimpleCharGrid
+import de.ronny_h.aoc.extensions.grids.Direction.*
+import de.ronny_h.aoc.extensions.grids.SimpleCharGrid
 import de.ronny_h.aoc.extensions.asList
 import de.ronny_h.aoc.extensions.memoize
 
@@ -81,7 +80,7 @@ class Keypad(layout: List<String>) : SimpleCharGrid(layout, ' ') {
         val directions = paths.map { shortestPath ->
             shortestPath.path
                 .windowed(2)
-                .map { (from, to) -> Direction.entries.first { from + it == to } }
+                .map { (from, to) -> entries.first { from + it == to } }
                 .joinToString("") {
                     when (it) {
                         NORTH -> "^"
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day22/MonkeyMarket.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day22/MonkeyMarket.kt
@@ -1,7 +1,7 @@
 package de.ronny_h.aoc.year2024.day22
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.onesDigit
+import de.ronny_h.aoc.extensions.numbers.onesDigit
 
 fun main() = MonkeyMarket().run(17965282217, 2152)
 
diff --git a/src/main/kotlin/de/ronny_h/aoc/year2024/day24/CrossedWires.kt b/src/main/kotlin/de/ronny_h/aoc/year2024/day24/CrossedWires.kt
@@ -1,8 +1,8 @@
 package de.ronny_h.aoc.year2024.day24
 
 import de.ronny_h.aoc.AdventOfCode
-import de.ronny_h.aoc.extensions.toBoolean
-import de.ronny_h.aoc.extensions.toDigit
+import de.ronny_h.aoc.extensions.numbers.toBoolean
+import de.ronny_h.aoc.extensions.numbers.toDigit
 
 fun main() = CrossedWires().run("66055249060558", "fcd,fhp,hmk,rvf,tpc,z16,z20,z33")
 
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/CoordinatesTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/CoordinatesTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/SimpleCharGridTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/SimpleCharGridTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/graphs/ShortestPathTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/graphs/ShortestPathTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/grids/CoordinatesTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/grids/CoordinatesTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/grids/GridTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/grids/GridTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/grids/SimpleCharGridTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/grids/SimpleCharGridTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/numbers/DigitsTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/numbers/DigitsTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/extensions/numbers/IntegralNumbersTest.kt b/src/test/kotlin/de/ronny_h/aoc/extensions/numbers/IntegralNumbersTest.kt
diff --git a/src/test/kotlin/de/ronny_h/aoc/year2015/day06/FireHazardTest.kt b/src/test/kotlin/de/ronny_h/aoc/year2015/day06/FireHazardTest.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.ronny_h.aoc.extensions`
	`1`	`+package de.ronny_h.aoc.extensions.graphs`
`2`	`2`
`3`	`3`	`import java.util.PriorityQueue`
`4`	`4`	`import kotlin.Int.Companion.MAX_VALUE`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.ronny_h.aoc.extensions`
	`1`	`+package de.ronny_h.aoc.extensions.grids`
`2`	`2`
`3`	`3`	`import kotlin.math.abs`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package de.ronny_h.aoc.extensions`
	`1`	`+package de.ronny_h.aoc.extensions.numbers`
`2`	`2`
`3`	`3`	`import kotlin.math.abs`
`4`	`4`