Refactoring

jurisk · Dec 16, 2023 · 29be731 · 29be731
1 parent 9c899dd
commit 29be731
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent17.scala b/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent17.scala
@@ -174,18 +174,8 @@ object Advent17 {
 
   def simulate(field: Field2D[Square]): Field2D[Square] = {
     printField("Before:", field)
-
-    val (result, _) = Simulation.runUntilStableStateWithCounter(State(field)) {
-      case (state, iteration) =>
-        val newState = state.next
-        if (iteration % 1_000 == 0) {
-          printField("Next", newState.field)
-        }
-        newState
-    }
-
+    val result = Simulation.runUntilStableState(State(field))(_.next)
     printField("After:", result.field)
-
     result.field
   }
 

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent24.scala b/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent24.scala
@@ -271,10 +271,7 @@ object Advent24 {
   }
 
   private def simulateRound(state: State): (Int, Int) = {
-    val (result, _) = Simulation.runUntilStableStateWithCounter(state) {
-      case (state, _) =>
-        state.next
-    }
+    val result = Simulation.runUntilStableState(state)(_.next)
 
     (
       result.immuneSystem.values.map(_.units).sum,