some minor day 7 improvements

norganos · Dec 7, 2023 · 50082bb · 50082bb
1 parent 78e78c0
commit 50082bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/kotlin/de/linkel/aoc/Day07.kt b/src/main/kotlin/de/linkel/aoc/Day07.kt
@@ -93,8 +93,8 @@ class Day07: AbstractLinesAdventDay<Long>() {
             .sortedWith { a, b ->
                 b.type.compareTo(a.type)
                     .takeIf { it != 0 }
-                    ?: (0..4).firstNotNullOfOrNull { i ->
-                        a.values[i].compareTo(b.values[i])
+                    ?: a.values.zip(b.values).firstNotNullOfOrNull { (ca, cb) ->
+                        ca.compareTo(cb)
                             .takeIf { it != 0 }
                     } ?: 0
             }

diff --git a/src/main/kotlin/de/linkel/aoc/base/AbstractFileAdventDay.kt b/src/main/kotlin/de/linkel/aoc/base/AbstractFileAdventDay.kt
@@ -36,7 +36,7 @@ abstract class AbstractFileAdventDay<T>: AdventDay<T> {
         val result = measureTimedValue {
             process(part, reader)
         }
-        println("Solution is $${result.value}")
+        println("Solution is ${result.value}")
         println ("calculation took ${msFormat.format(result.duration.inWholeMicroseconds / 1000F)}ms")
         return result.value
     }