Refactor parts in 2024 day 3

Author: sim642

src/main/scala/eu/sim642/adventofcode2024/Day3.scala

@@ -2,33 +2,41 @@ package eu.sim642.adventofcode2024
 
 object Day3 {
 
-  private val mulRegex = """mul\((\d{1,3}),(\d{1,3})\)""".r
+  trait Part {
+    def sumMuls(s: String): Int
+  }
+
+  object Part1 extends Part {
+    private val mulRegex = """mul\((\d{1,3}),(\d{1,3})\)""".r
 
-  def sumUncorruptedMuls(s: String): Int = {
-    mulRegex.findAllMatchIn(s)
-      .map(m => m.group(1).toInt * m.group(2).toInt)
-      .sum
+    override def sumMuls(s: String): Int = {
+      mulRegex.findAllMatchIn(s)
+        .map(m => m.group(1).toInt * m.group(2).toInt)
+        .sum
+    }
   }
 
-  private val mulRegex2 = """mul\((\d{1,3}),(\d{1,3})\)|do(n't)?\(\)""".r
-
-  def sumUncorruptedMuls2(s: String): Int = {
-    mulRegex2.findAllMatchIn(s)
-      .foldLeft((true, 0))({ case ((enabled, sum), m) =>
-        (enabled, m.matched) match {
-          case (_, "do()") => (true, sum)
-          case (_, "don't()") => (false, sum)
-          case (true, _) => (enabled, sum + m.group(1).toInt * m.group(2).toInt)
-          case (false, _) => (enabled, sum)
-        }
-      })
-      ._2
+  object Part2 extends Part {
+    private val mulRegex = """mul\((\d{1,3}),(\d{1,3})\)|do(n't)?\(\)""".r
+
+    override def sumMuls(s: String): Int = {
+      mulRegex.findAllMatchIn(s)
+        .foldLeft((true, 0))({ case ((enabled, sum), m) =>
+          (enabled, m.matched) match {
+            case (_, "do()") => (true, sum)
+            case (_, "don't()") => (false, sum)
+            case (true, _) => (enabled, sum + m.group(1).toInt * m.group(2).toInt)
+            case (false, _) => (enabled, sum)
+          }
+        })
+        ._2
+    }
   }
 
   lazy val input: String = scala.io.Source.fromInputStream(getClass.getResourceAsStream("day3.txt")).mkString.trim
 
   def main(args: Array[String]): Unit = {
-    println(sumUncorruptedMuls(input))
-    println(sumUncorruptedMuls2(input))
+    println(Part1.sumMuls(input))
+    println(Part2.sumMuls(input))
   }
 }

src/test/scala/eu/sim642/adventofcode2024/Day3Test.scala

@@ -9,18 +9,18 @@ class Day3Test extends AnyFunSuite {
   val exampleInput2 = """xmul(2,4)&mul[3,7]!^don't()_mul(5,5)+mul(32,64](mul(11,8)undo()?mul(8,5))"""
 
   test("Part 1 examples") {
-    assert(sumUncorruptedMuls(exampleInput) == 161)
+    assert(Part1.sumMuls(exampleInput) == 161)
   }
 
   test("Part 1 input answer") {
-    assert(sumUncorruptedMuls(input) == 182780583)
+    assert(Part1.sumMuls(input) == 182780583)
   }
 
   test("Part 2 examples") {
-    assert(sumUncorruptedMuls2(exampleInput2) == 48)
+    assert(Part2.sumMuls(exampleInput2) == 48)
   }
 
   test("Part 2 input answer") {
-    assert(sumUncorruptedMuls2(input) == 90772405)
+    assert(Part2.sumMuls(input) == 90772405)
   }
 }