part 2 aludes me ... perhaos pick up another day

Author: suggitpe

2024/src/main/kotlin/org/suggs/aoc2024/Day05PrintQueue.kt

@@ -2,29 +2,61 @@ package org.suggs.aoc2024
 
 import org.slf4j.LoggerFactory
 import org.suggs.aoc2024.Day05PrintQueue.extractMiddleNumberFrom
+import org.suggs.aoc2024.Day05PrintQueue.isValidPrintJob
 import kotlin.math.abs
 
 object Day05PrintQueue {
 
-    fun sumMiddleNumbersFromValidPrintQueues(data: List<String>) =
+    fun sumMiddleNumbersFromValidPrintQueues(data: List<String>): Int =
         sumMiddleNumbersFromValidPrintQueuesFrom(readPrintJobsFrom(data.last().split("\n")))
             .using(createRulesListFrom(data.first().split(("\n"))))
 
-    private fun sumMiddleNumbersFromValidPrintQueuesFrom(jobs: List<Set<Int>>) = QueueCounter(jobs)
+    private fun sumMiddleNumbersFromValidPrintQueuesFrom(jobs: List<List<Int>>): QueueCounter = QueueCounter(jobs)
 
-    private fun createRulesListFrom(rules: List<String>) = rules.map { it.split("|").let { Pair(it[0].toInt(), it[1].toInt()) } }
+    fun correctIncorrectlyOrderedPrintJobsThenSumMedium(data: List<String>): Int =
+        correctIncorrectlyOrderedPrintJobsThenSumMediumFrom(readPrintJobsFrom(data.last().split("\n")))
+            .using(createRulesListFrom(data.first().split(("\n"))))
+
+    private fun correctIncorrectlyOrderedPrintJobsThenSumMediumFrom(jobs: List<List<Int>>): QueueCorrector = QueueCorrector(jobs)
+
+    internal fun isValidPrintJob(job: List<Int>, rules: List<Pair<Int, Int>>): Boolean =
+        rules.filter { job.containsAll(listOf(it.first, it.second)) }.all { job.indexOf(it.first) < job.indexOf(it.second) }
 
-    private fun readPrintJobsFrom(jobs: List<String>) = jobs.map { it.split(",").map { it.toInt() }.toSet() }
+    internal fun extractMiddleNumberFrom(setOfPages: List<Int>): Int = setOfPages.elementAt(abs(setOfPages.size / 2))
 
-    internal fun extractMiddleNumberFrom(setOfPages: Set<Int>) = setOfPages.elementAt(abs(setOfPages.size / 2))
+    internal fun createRulesListFrom(rules: List<String>) = rules.map { it.split("|").let { Pair(it[0].toInt(), it[1].toInt()) } }
+    internal fun readPrintJobsFrom(jobs: List<String>) = jobs.map { it.split(",").map { it.toInt() }.toList() }
 
 }
 
-class QueueCounter(private val jobs: List<Set<Int>>) {
+class QueueCorrector(private val jobs: List<List<Int>>) {
 
-    fun using(rules: List<Pair<Int, Int>>) = jobs.filter { isValidPrintJob(it, rules) }.sumOf { extractMiddleNumberFrom(it) }
+    fun using(rules: List<Pair<Int, Int>>) = jobs.filterNot { isValidPrintJob(it, rules) }.map { fixBrokenPrintJob(it.toMutableList(), rules) }.sumOf { extractMiddleNumberFrom(it) }
 
-    private fun isValidPrintJob(job: Set<Int>, rules: List<Pair<Int, Int>>) =
-        rules.filter { job.containsAll(listOf(it.first, it.second)) }.all { job.indexOf(it.first) < job.indexOf(it.second) }
+    fun fixBrokenPrintJob(job: MutableList<Int>, rules: List<Pair<Int, Int>>): List<Int> {
+        val brokenRules = rules.filter { job.containsAll(listOf(it.first, it.second)) }.filterNot{job.indexOf(it.first) < job.indexOf(it.second)}
+        brokenRules.reversed().forEach { rule ->
+            job.removeElemValue(rule.first)
+            job.insertElemAfter(rule.second, rule.first)
+            if(isValidPrintJob(job, rules))
+                return job
+        }
+        return job
+    }
+
+    private fun MutableList<Int>.removeElemValue(value: Int){
+        this.remove(elementAt(indexOf(value)))
+    }
+
+    private fun MutableList<Int>.insertElemAfter(search: Int, value: Int){
+        val location = indexOf(search)
+        add(location, value)
+    }
+
+}
+
+class QueueCounter(private val jobs: List<List<Int>>) {
+
+    fun using(rules: List<Pair<Int, Int>>) = jobs.filter { isValidPrintJob(it, rules) }.sumOf { extractMiddleNumberFrom(it) }
 
 }

2024/src/test/kotlin/org/suggs/aoc2024/Day05PrintQueueTest.kt

@@ -5,6 +5,7 @@ import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.suggs.adventofcode.Util.getTextBlocksFrom
+import org.suggs.aoc2024.Day05PrintQueue.correctIncorrectlyOrderedPrintJobsThenSumMedium
 import org.suggs.aoc2024.Day05PrintQueue.extractMiddleNumberFrom
 import org.suggs.aoc2024.Day05PrintQueue.sumMiddleNumbersFromValidPrintQueues
 
@@ -23,9 +24,20 @@ class Day05PrintQueueTest {
     }
 
     @Test
-    fun `can get middle element in a set`(){
-        extractMiddleNumberFrom(setOf(0,1,2,3,4)) shouldBe 2
-        extractMiddleNumberFrom(setOf(0,1,2)) shouldBe 1
+    fun `can get middle element in a set`() {
+        extractMiddleNumberFrom(listOf(0, 1, 2, 3, 4)) shouldBe 2
+        extractMiddleNumberFrom(listOf(0, 1, 2)) shouldBe 1
+    }
+
+    @Test
+    fun `corrects incorrectly ordered print jobs from small data`() {
+        correctIncorrectlyOrderedPrintJobsThenSumMedium(smallData) shouldBe 123
+    }
+
+    @Test
+    @Disabled
+    fun `corrects incorrectly ordered print jobs from large data`() {
+        correctIncorrectlyOrderedPrintJobsThenSumMedium(largeData) shouldBe 123
     }
 
     private val largeData = getTextBlocksFrom("day05-input.txt")