Refactoring - made Field2D.atUnsafe private

jurisk · Dec 3, 2023 · a34fd99 · a34fd99
1 parent 469ea87
commit a34fd99
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent13.scala b/scala2/src/main/scala/jurisk/adventofcode/y2018/Advent13.scala
@@ -33,7 +33,7 @@ object Advent13 {
     }
 
     def next(board: Field2D[Track]): Cart = {
-      val square = board.atUnsafe(coords)
+      val square = board.atOrElse(coords, Track.Empty)
 
       val newDirection = square match {
         case Track.Intersection =>
@@ -58,7 +58,7 @@ object Advent13 {
             case Direction2D.W => N
             case _             => sys.error(s"Unexpected direction $direction")
           }
-        case _           => sys.error(s"Unexpected situation $square")
+        case Track.Empty => sys.error(s"Unexpected situation $square")
       }
 
       Cart(

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2022/Advent22.scala b/scala2/src/main/scala/jurisk/adventofcode/y2022/Advent22.scala
@@ -207,7 +207,7 @@ object Advent22 {
       sanityCheck._1 shouldEqual position
       sanityCheck._2.rotate(TurnAround) shouldEqual direction
 
-      field.atUnsafe(nextCoords) match {
+      field.atOrElse(nextCoords, Square.Outside) match {
         case Square.Outside => sys.error("Should not happen")
         case Square.Wall    => this
         case Square.Open    =>

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2022/Advent24.scala b/scala2/src/main/scala/jurisk/adventofcode/y2022/Advent24.scala
@@ -156,7 +156,7 @@ object Advent24 {
 
     val withBlizzards = maze.blizzards.foldLeft(field) { case (acc, b) =>
       val location = maze.blizzardAt(b, state.time)
-      val oldList  = acc.atUnsafe(location)
+      val oldList  = acc.atOrElse(location, Nil)
       val newList  = b.direction :: oldList
       acc.updatedAtUnsafe(location, newList)
     }

diff --git a/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent03.scala b/scala2/src/main/scala/jurisk/adventofcode/y2023/Advent03.scala
@@ -65,9 +65,10 @@ object Advent03 {
     islands.map { island =>
       val number = island.toList
         .sortBy(_.x)
-        .map { c =>
-          field.atUnsafe(c).toChar
+        .flatMap { c =>
+          field.at(c)
         }
+        .map(_.toChar)
         .mkString
         .toInt
       (number, island)

diff --git a/scala2/src/main/scala/jurisk/geometry/Field2D.scala b/scala2/src/main/scala/jurisk/geometry/Field2D.scala
@@ -43,7 +43,10 @@ final case class Field2D[T](
       .lift(c.y - topLeft.y)
       .flatMap(_.lift(c.x - topLeft.x))
 
-  def atUnsafe(c: Coords2D): T =
+  def atOrElse(c: Coords2D, default: => T): T =
+    at(c) getOrElse default
+
+  private def atUnsafe(c: Coords2D): T =
     at(c) getOrElse sys.error(s"Coords2D $c are invalid")
 
   def updatedAtUnsafe(c: Coords2D, newValue: T): Field2D[T] = {