1 files changed, 32 insertions, 29 deletions

diff --git a/src/Day05.kt b/src/Day05.kt
index eaa7b66..2c5e219 100644
--- a/src/Day05.kt
+++ b/src/Day05.kt
@@ -2,40 +2,40 @@ import kotlin.math.absoluteValue
 import kotlin.math.max
 import kotlin.math.sign
 
-data class Line(val start: Pos2D, val end: Pos2D) {
-    companion object {
-        fun fromString(input: String): Line {
-            val (start, end) = input.split(" -> ").map { coordinateString ->
-                val (x, y) = coordinateString.split(",").map(String::toInt)
-                Pos2D(x, y)
+object Day05 {
+    private data class Line(val start: Pos2D, val end: Pos2D) {
+        companion object {
+            fun fromString(input: String): Line {
+                val (start, end) = input.split(" -> ").map { coordinateString ->
+                    val (x, y) = coordinateString.split(",").map(String::toInt)
+                    Pos2D(x, y)
+                }
+
+                return Line(start, end)
             }
-
-            return Line(start, end)
         }
-    }
 
-    val isHorizontalOrVertical: Boolean
-        get() = start.x == end.x || start.y == end.y
+        val isHorizontalOrVertical: Boolean
+            get() = start.x == end.x || start.y == end.y
 
-    val isDiagonal: Boolean
-        get() = (end.x - start.x).absoluteValue == (end.y - start.y).absoluteValue
+        val isDiagonal: Boolean
+            get() = (end.x - start.x).absoluteValue == (end.y - start.y).absoluteValue
 
-    val pointSequence: Sequence<Pos2D>
-        get() = sequence {
-            val xOffset = end.x - start.x
-            val yOffset = end.y - start.y
+        val pointSequence: Sequence<Pos2D>
+            get() = sequence {
+                val xOffset = end.x - start.x
+                val yOffset = end.y - start.y
 
-            for (s in 0..max(xOffset.absoluteValue, yOffset.absoluteValue)) {
-                val x = start.x + s * xOffset.sign
-                val y = start.y + s * yOffset.sign
+                for (s in 0..max(xOffset.absoluteValue, yOffset.absoluteValue)) {
+                    val x = start.x + s * xOffset.sign
+                    val y = start.y + s * yOffset.sign
 
-                yield(Pos2D(x, y))
+                    yield(Pos2D(x, y))
+                }
             }
-        }
-}
+    }
 
-fun main() {
-    fun helper(input: List<String>, linePredicate: (line: Line) -> Boolean) = input
+    private fun helper(input: List<String>, linePredicate: (line: Line) -> Boolean) = input
         .asSequence()
         .map(Line::fromString)
         .filter(linePredicate)
@@ -49,11 +49,14 @@ fun main() {
 
     fun part2(input: List<String>): Int = helper(input) { it.isHorizontalOrVertical || it.isDiagonal }
 
+}
+
+fun main() {
     val testInput = readInputAsLines("Day05_test")
-    check(part1(testInput) == 5)
-    check(part2(testInput) == 12)
+    check(Day05.part1(testInput) == 5)
+    check(Day05.part2(testInput) == 12)
 
     val input = readInputAsLines("Day05")
-    println(part1(input))
-    println(part2(input))
+    println(Day05.part1(input))
+    println(Day05.part2(input))
 }