Solved day11 part 2

Author: Gentleman1983

build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 // project meta data
 group 'de.havox_design.aoc2023'
-version '0.10.5'
+version '0.10.6'
 
 // Switch to gradle "all" distribution.
 wrapper {

day11/src/main/kotlin/de/havox_design/aoc2023/day11/Day11.kt

@@ -8,10 +8,10 @@ class Day11(private var filename: String) {
     fun solvePart1(): Long =
         processSumOfAllDistances(getResourceAsText(filename))
 
-    fun solvePart2(): Long =
-        0L
+    fun solvePart2(expansion: Long = 1000000): Long =
+        processSumOfAllDistances(getResourceAsText(filename), expansion)
 
-    private fun processSumOfAllDistances(input: List<String>): Long {
+    private fun processSumOfAllDistances(input: List<String>, expansion: Long = 2): Long {
         val galaxies = input
             .flatMapIndexed { y, s ->
                 s.mapIndexed { x, c -> if (c == ICON_GALAXY.first()) Pair(y.toLong(), x.toLong()) else null }
@@ -32,7 +32,7 @@ class Day11(private var filename: String) {
                     .contains(ICON_GALAXY)
             }
             .map { it.index.toLong() }
-        val expandedGalaxies = calculateUniverseExpansion(galaxies, emptyRows, emptyColumns)
+        val expandedGalaxies = calculateUniverseExpansion(galaxies, emptyRows, emptyColumns, expansion)
         val galaxyPairs = expandedGalaxies
             .flatMapIndexed { index, galaxy ->
                 expandedGalaxies
@@ -48,12 +48,13 @@ class Day11(private var filename: String) {
     private fun calculateUniverseExpansion(
         galaxies: List<Pair<Long, Long>>,
         emptyRows: List<Long>,
-        emptyColumns: List<Long>
+        emptyColumns: List<Long>,
+        expansion: Long = 2
     ) =
         galaxies
             .map {
-                Pair(it.first + emptyRows.count { r -> r < it.first },
-                    it.second + emptyColumns.count { c -> c < it.second })
+                Pair(it.first + emptyRows.count { r -> r < it.first } * (expansion - 1),
+                    it.second + emptyColumns.count { c -> c < it.second } * (expansion - 1))
             }
 
     private fun calculateDistance(galaxy1: Pair<Long, Long>, galaxy2: Pair<Long, Long>): Long {

day11/src/test/kotlin/de/havox_design/aoc2023/day11/Day11Test.kt

@@ -20,7 +20,7 @@ class Day11Test {
 
     @ParameterizedTest
     @MethodSource("getDataForTestSolvePart2")
-    fun testSolvePart2(filename: String, expectedResult: Long, expansion: Int) =
+    fun testSolvePart2(filename: String, expectedResult: Long, expansion: Long) =
         Day11(filename).solvePart2(expansion).shouldBe(expectedResult)
 
     companion object {
@@ -33,8 +33,8 @@ class Day11Test {
         @JvmStatic
         private fun getDataForTestSolvePart2(): Stream<Arguments> =
             Stream.of(
-                Arguments.of("sample.txt", 1030L, 10),
-                Arguments.of("sample.txt", 8410L, 100)
+                Arguments.of("sample.txt", 1030L, 10L),
+                Arguments.of("sample.txt", 8410L, 100L)
             )
     }
 }