Misc optimisation

Author: jurisk

scala2/src/main/scala/jurisk/adventofcode/y2024/Advent07.scala

@@ -1,9 +1,12 @@
 package jurisk.adventofcode.y2024
 
+import cats.effect.IO
+import cats.effect.IOApp
+import cats.implicits.catsSyntaxParallelTraverse1
 import jurisk.utils.FileInput._
 import jurisk.utils.Parsing.StringOps
 
-object Advent07 {
+object Advent07 extends IOApp.Simple {
   type Input = List[Equation]
 
   private def concatLongs(a: Long, b: Long): Long = {
@@ -48,13 +51,19 @@ object Advent07 {
   def parse(input: String): Input =
     input.parseLines(Equation.parse)
 
-  def solve(data: Input, allowPipe: Boolean): Long =
-    data.filter(_.validate(allowPipe)).map(_.result).sum
+  def solve(data: Input, allowPipe: Boolean): IO[Long] =
+    data
+      .parTraverse { equation =>
+        for {
+          valid <- IO(equation.validate(allowPipe))
+        } yield if (valid) equation.result else 0
+      }
+      .map(_.sum)
 
-  def part1(data: Input): Long =
+  def part1(data: Input): IO[Long] =
     solve(data, allowPipe = false)
 
-  def part2(data: Input): Long =
+  def part2(data: Input): IO[Long] =
     solve(data, allowPipe = true)
 
   def parseFile(fileName: String): Input =
@@ -63,10 +72,12 @@ object Advent07 {
   def fileName(suffix: String): String =
     s"2024/07$suffix.txt"
 
-  def main(args: Array[String]): Unit = {
-    val realData: Input = parseFile(fileName(""))
-
-    println(s"Part 1: ${part1(realData)}")
-    println(s"Part 2: ${part2(realData)}")
-  }
+  override def run: IO[Unit] =
+    for {
+      realData <- IO(parseFile(fileName("")))
+      result1  <- part1(realData)
+      _        <- IO(println(s"Part 1: $result1"))
+      result2  <- part2(realData)
+      _        <- IO(println(s"Part 2: $result2"))
+    } yield ()
 }

scala2/src/main/scala/jurisk/adventofcode/y2024/Advent13.scala

@@ -143,7 +143,7 @@ object Advent13 {
     input.parseSections(Machine.parse)
 
   def part1(data: Input): N =
-    data.flatMap(_.solve(BruteForce(100))).sum
+    data.flatMap(_.solve(LinearEquations)).sum
 
   def part2(data: Input): N = {
     val adjusted = data.map(m =>

scala2/src/main/scala/jurisk/adventofcode/y2024/Advent14.scala

@@ -1,12 +1,10 @@
 package jurisk.adventofcode.y2024
 
-import cats.implicits.{
-  catsSyntaxEitherId,
-  catsSyntaxOptionId,
-  none,
-  toFunctorOps,
-  toUnorderedFoldableOps,
-}
+import cats.implicits.catsSyntaxEitherId
+import cats.implicits.catsSyntaxOptionId
+import cats.implicits.none
+import cats.implicits.toFunctorOps
+import cats.implicits.toUnorderedFoldableOps
 import jurisk.geometry.Coords2D
 import jurisk.geometry.Direction2D
 import jurisk.geometry.Direction2D.NE

scala2/src/main/scala/jurisk/adventofcode/y2024/Advent20.scala

@@ -68,8 +68,10 @@ object Advent20 {
     def isEmpty(c: Coords2D): Boolean =
       field.at(c).contains(false)
 
+    val emptyCoords = field.allCoords.filter(isEmpty)
+
     (for {
-      c1   <- field.allCoords.filter(isEmpty)
+      c1   <- emptyCoords
       c2   <- c1.allCoordsWithinManhattanDistance(maxCheat)
       if isEmpty(c2)
       if c1 != c2

scala2/src/test/scala/jurisk/adventofcode/y2024/Advent07Spec.scala

@@ -1,16 +1,19 @@
 package jurisk.adventofcode.y2024
 
 import Advent07._
-import org.scalatest.freespec.AnyFreeSpec
+import cats.effect.testing.scalatest.AsyncIOSpec
+import org.scalatest.freespec.{AnyFreeSpec, AsyncFreeSpec}
 import org.scalatest.matchers.should.Matchers._
 
-class Advent07Spec extends AnyFreeSpec {
+class Advent07Spec extends AsyncFreeSpec with AsyncIOSpec {
   private def testData = parseFile(fileName("-test-00"))
   private def realData = parseFile(fileName(""))
 
   "part 1" - {
     "test" in {
-      part1(testData) shouldEqual 3749
+      part1(testData) asserting {
+        _ shouldEqual 3749
+      }
     }
 
     "3267: 81 40 27" in {
@@ -23,17 +26,23 @@ class Advent07Spec extends AnyFreeSpec {
     }
 
     "real" in {
-      part1(realData) shouldEqual 1038838357795L
+      part1(realData) asserting {
+        _ shouldEqual 1038838357795L
+      }
     }
   }
 
   "part 2" - {
     "test" in {
-      part2(testData) shouldEqual 11387
+      part2(testData) asserting {
+        _ shouldEqual 11387
+      }
     }
 
     "real" in {
-      part2(realData) shouldEqual 254136560217241L
+      part2(realData) asserting {
+        _ shouldEqual 254136560217241L
+      }
     }
   }
 }

scala2/src/test/scala/jurisk/adventofcode/y2024/Advent13Spec.scala

@@ -24,11 +24,16 @@ class Advent13Spec extends AnyFreeSpec {
   }
 
   "part 2" - {
-    "test #0" in {
+    "test #0 Z3" ignore {
       val example  = testData.head
       val expected = Some(80 * 3 + 40)
       example.solve(Z3(Internal)) shouldEqual expected
       example.solve(Z3(External)) shouldEqual expected
+    }
+
+    "test #0 linear equations" in {
+      val example  = testData.head
+      val expected = Some(80 * 3 + 40)
       example.solve(LinearEquations) shouldEqual expected
     }