feat: move code to top level project

FelixDombek · Dec 5, 2023 · 888c3c8 · 888c3c8
1 parent 6e60f0b
commit 888c3c8
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 219 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
-# AdventOfCode
-AdventOfCode puzzle solutions
-2023: [AdventOfCode2023.kt](app/src/test/kotlin/com/example/adventofcode/AdventOfCode2023.kt)
+# AdventOfCode
+AdventOfCode puzzle solutions
+2023: [AdventOfCode2023.kt](src/test/kotlin/com/example/adventofcode/AdventOfCode2023.kt)
diff --git a/app/.gitignore b/app/.gitignore
diff --git a/app/bin/test/com/example/adventofcode/AdventOfCode2023.kt b/app/bin/test/com/example/adventofcode/AdventOfCode2023.kt
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
diff --git a/app/src/test/kotlin/com/example/adventofcode/AdventOfCode2022.kt b/app/src/test/kotlin/com/example/adventofcode/AdventOfCode2022.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,4 +12,21 @@ tasks {
     wrapper {
         gradleVersion = "8.5"
     }
+    test {
+        useJUnit()
+        testLogging {
+            events("passed", "skipped", "failed")
+        }
+    }
+    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+        kotlinOptions {
+            jvmTarget = "17"
+        }
+    }
+}
+
+dependencies {
+    testImplementation(kotlin("test"))
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("com.google.guava:guava:31.1-jre")
 }
diff --git a/app/res/2022/01.txt → res/2022/01.txt b/app/res/2022/01.txt → res/2022/01.txt
diff --git a/app/res/2023/01.txt → res/2023/01.txt b/app/res/2023/01.txt → res/2023/01.txt
diff --git a/app/res/2023/02.txt → res/2023/02.txt b/app/res/2023/02.txt → res/2023/02.txt
diff --git a/app/res/2023/03.txt → res/2023/03.txt b/app/res/2023/03.txt → res/2023/03.txt
diff --git a/app/res/2023/04.txt → res/2023/04.txt b/app/res/2023/04.txt → res/2023/04.txt
diff --git a/app/res/2023/05.txt → res/2023/05.txt b/app/res/2023/05.txt → res/2023/05.txt
diff --git a/.../example/adventofcode/AdventOfCode2022.kt → .../example/adventofcode/AdventOfCode2022.kt b/.../example/adventofcode/AdventOfCode2022.kt → .../example/adventofcode/AdventOfCode2022.kt
diff --git a/.../example/adventofcode/AdventOfCode2023.kt → .../example/adventofcode/AdventOfCode2023.kt b/.../example/adventofcode/AdventOfCode2023.kt → .../example/adventofcode/AdventOfCode2023.kt
@@ -7,6 +7,7 @@ import java.util.Scanner
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.pow
+import kotlin.system.measureTimeMillis
 
 
 fun getFile(day: String): File {
@@ -148,8 +149,7 @@ class AdventOfCode2023 {
     @Test
     fun day5() {
         val input = getString("5").split("\n\n")
-        val seedLine = input[0].split(" ").drop(1)
-        val seeds = seedLine.map { it.toLong() }
+        val seeds = input[0].split(" ").drop(1).map { it.toLong() }
         val maps = input.drop(1).map { mapBlock ->
             mapBlock.split("\n").drop(1).map { mapLine ->
                 val (to, from, len) = mapLine.split(" ").map { it.toLong() }
@@ -168,8 +168,13 @@ class AdventOfCode2023 {
         println("Day 5.1: $loc")
         assertEquals(600279879, loc)
 
-        val loc2 = seedLine.chunked(2) { (s, l) ->
-            mapSeeds((s.toLong()..<s.toLong()+l.toLong()).asSequence())
+        val loc2 = seeds.chunked(2) { (seed, len) -> // takes 12 mins, needs optimization
+            var m: Long
+            val millis = measureTimeMillis {
+                m = mapSeeds((seed..<seed + len).asSequence())
+            }
+            println("Day 5.2: $seed, len=$len took ${millis / 1000.0}s")
+            m
         }.min()
         println("Day 5.2: $loc2")
         assertEquals(20191102, loc2)