From 10b625d2325e1e89ad1ae2251cbc21bfe96468c9 Mon Sep 17 00:00:00 2001
From: Sven Weidauer <sven@5sw.de>
Date: Wed, 11 Dec 2024 19:35:56 +0100
Subject: [PATCH] Refactor

---
 2024/src/main/kotlin/day9.kt | 52 +++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/2024/src/main/kotlin/day9.kt b/2024/src/main/kotlin/day9.kt
index e23caec..05f7834 100644
--- a/2024/src/main/kotlin/day9.kt
+++ b/2024/src/main/kotlin/day9.kt
@@ -1,40 +1,33 @@
 sealed class Span {
     abstract val length: Int
 
-    data class Empty(override val length: Int): Span()
-    data class File(val id: Int, override val  length: Int): Span()
+    data class Empty(override val length: Int) : Span()
+    data class File(val id: Int, override val length: Int) : Span()
 }
 
+
 fun main() {
     var currentFileId = 0
-    val disk = readInputString("day9.txt").mapIndexed { index, c ->
+    val input = readInputString("day9.txt").mapIndexed { index, c ->
         if (index % 2 == 0) {
             Span.File(currentFileId++, c.digitToInt())
         } else {
             Span.Empty(c.digitToInt())
         }
-    }.toMutableList()
-
-    fun take(blocks: Int): Span.File {
-        var block: Span
-        do {
-            block = disk.removeLast()
-        } while (block !is Span.File)
-
-        if (block.length > blocks) {
-            disk.add(Span.File(block.id, block.length - blocks))
-            return Span.File(block.id, blocks)
-        }
-
-        return block
     }
 
+    println("Part 1: ${part1(input)}")
+}
+
+private fun part1(input: List<Span>): Long {
+    val disk = input.toMutableList()
+
     var index = 1
     while (index < disk.count()) {
         require(disk[index] is Span.Empty)
 
         val freeSpace = disk[index].length
-        val fillData = take(freeSpace)
+        val fillData = disk.takeFileBlocksFromEnd(freeSpace)
         disk[index] = fillData
 
         if (fillData.length < freeSpace) {
@@ -45,15 +38,30 @@ fun main() {
         }
     }
 
-    val checkSum = calculateCheckSum(disk)
-    println("Part 1: $checkSum")
+    val checkSum = disk.calculateCheckSum()
+    return checkSum
 }
 
-private fun calculateCheckSum(disk: List<Span>): Long {
+private fun MutableList<Span>.takeFileBlocksFromEnd(blocks: Int): Span.File {
+    var block: Span
+    do {
+        block = removeLast()
+    } while (block !is Span.File)
+
+    if (block.length > blocks) {
+        add(Span.File(block.id, block.length - blocks))
+        return Span.File(block.id, blocks)
+    }
+
+    return block
+}
+
+
+private fun List<Span>.calculateCheckSum(): Long {
     var checkSum = 0L
     var currentBlock = 0L
 
-    for (file in disk) {
+    for (file in this) {
         require(file is Span.File)
 
         repeat(file.length) {