Remove hard coded size of the grid

lenguyenthanh · Dec 10, 2023 · 40205c1 · 40205c1
1 parent 96d9910
commit 40205c1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git a/Day03.scala b/Day03.scala
@@ -5,11 +5,9 @@ import fs2.Stream
 
 object Day03 extends AOCApp(2023, 3):
 
-  def part1(input: Stream[IO, String]): IO[String] =
-    sovle(input, _.calculateP1())
+  def part1(input: Stream[IO, String]): IO[String] = sovle(input, _.calculateP1())
 
-  def part2(input: Stream[IO, String]): IO[String] =
-    sovle(input, _.calculateP2())
+  def part2(input: Stream[IO, String]): IO[String] = sovle(input, _.calculateP2())
 
   def sovle(input: Stream[IO, String], f: Schematic => Long): IO[String] =
     input

diff --git a/Day07.scala b/Day07.scala
@@ -9,10 +9,7 @@ object Day07 extends AOCApp(2023, 7):
   def part2(input: Stream[IO, String]) = solve(_.solveP2())(input)
 
   def solve(f: Solution => Long): Stream[IO, String] => IO[String] =
-    _.compileAsList(Parser.parseLine)
-      .map(Solution(_))
-      .map(f)
-      .map(_.toString)
+    _.compileAsList(Parser.parseLine).map(Solution(_)).map(f).map(_.toString)
 
   enum Card:
     case A, K, Q, J, T, Nine, Eight, Seven, Six, Five, Four, Three, Two

diff --git a/Day08.scala b/Day08.scala
@@ -9,12 +9,7 @@ object Day08 extends AOCApp(2023, 8):
   def part2(input: Stream[IO, String]): IO[String] = solve(input, _.solveP2)
 
   def solve(input: Stream[IO, String], f: Solution => Any): IO[String] =
-    input
-      .map(Parser.parse)
-      .map(f)
-      .map(_.toString)
-      .compile
-      .lastOrError
+    input.map(Parser.parse).map(f).map(_.toString).compile.lastOrError
 
   case class Pair(left: String, right: String)
   enum Direction:

diff --git a/Day10.scala b/Day10.scala
@@ -11,12 +11,7 @@ object Day10 extends AOCApp(2023, 10):
   def part2(input: Stream[IO, String]) = solve(input, _.solveP2())
 
   def solve(input: Stream[IO, String], f: Solution => Any): IO[String] =
-    input
-      .map(Parser.parse)
-      .map(f)
-      .map(_.toString)
-      .compile
-      .lastOrError
+    input.map(Parser.parse).map(f).map(_.toString).compile.lastOrError
 
   enum Direction(val value: Char):
     case VP extends Direction('|')
@@ -31,7 +26,7 @@ object Day10 extends AOCApp(2023, 10):
 
   type Grid = Map[Point, Direction]
 
-  case class Solution(start: Point, map: Grid):
+  case class Solution(start: Point, map: Grid, size: Int):
     lazy val possibilities: List[Grid] =
       Direction.values.toList.map(map.updated(start, _))
 
@@ -41,14 +36,13 @@ object Day10 extends AOCApp(2023, 10):
     def solveP2(): Int =
       val (map, ls) = possibilities.collectFirstSome(x => findPath(x).map(x -> _)).get
       val path      = map.filter(x => ls.contains(x._1))
-      val size      = 140
       val all = for
         x <- List.range(0, size)
         y <- List.range(0, size)
       yield Point(x, y)
-      all.count(isInside(path, size))
+      all.count(isInside(path))
 
-    def isInside(path: Grid, size: Int)(p: Point): Boolean =
+    def isInside(path: Grid)(p: Point): Boolean =
       if path.contains(p) then false
       else
         val n = List
@@ -109,6 +103,8 @@ object Day10 extends AOCApp(2023, 10):
       .map: xs =>
         val start = xs.collectFirst { case (p, Left(_)) => p }.get
         val map   = xs.collect { case (p, Right(d)) => p -> d }.toMap
-        Solution(start, map)
+        start -> map
 
-    def parse(str: String) = solution.parseAll(str).toOption.get
+    def parse(str: String) =
+      val (start, map) = solution.parseAll(str).toOption.get
+      Solution(start, map, str.split("\n").toList.size)