make things less dopey

codeforkjeff · codeforkjeff · commit efd56df0a620 · 2018-12-10T18:40:42.000-08:00
diff --git a/src/main/scala/org/codefork/aoc2018/Day10.scala b/src/main/scala/org/codefork/aoc2018/Day10.scala
@@ -21,19 +21,20 @@ object Day10 {
 
     def nextSecond =
       copy(coords = coords.map(_.move), t+1)
+
+    def render: String =
+      minY.to(maxY).foldLeft("") { (grid, y) =>
+        grid +minX.to(maxX).foldLeft("") { (line, x) =>
+          line + (if (set.contains((x, y))) "#" else ".")
+        } + "\n"
+      }
+
   }
 
-  def findLetters(coordSet: CoordSet, lastSetOpt: Option[CoordSet] = None): (String, CoordSet) = {
+  def findLetters(coordSet: CoordSet, lastSetOpt: Option[CoordSet] = None): CoordSet = {
     // height initially shrinks; when it starts growing again, the last coordset is the answer
     if (lastSetOpt.isDefined && coordSet.height > lastSetOpt.get.height) {
-      val lastSet = lastSetOpt.get
-
-      val text = lastSet.minY.to(lastSet.maxY).foldLeft("") { (grid, y) =>
-        grid + lastSet.minX.to(lastSet.maxX).foldLeft("") { (line, x) =>
-          line + (if (lastSet.set.contains((x, y))) "#" else ".")
-        } + "\n"
-      }
-      (text, lastSet)
+      lastSetOpt.get
     } else {
       findLetters(coordSet.nextSecond, Some(coordSet))
     }
diff --git a/src/main/scala/org/codefork/aoc2018/Day10Part1.scala b/src/main/scala/org/codefork/aoc2018/Day10Part1.scala
@@ -5,8 +5,7 @@ import org.codefork.aoc2018.Day10.{CoordSet, getCoords}
 object Day10Part1 extends Part {
 
   override def answer: String = {
-    val (msg, coordSet) = Day10.findLetters(CoordSet(getCoords))
-    "\n" + msg
+    "\n" + Day10.findLetters(CoordSet(getCoords)).render
   }
 
 }
diff --git a/src/main/scala/org/codefork/aoc2018/Day10Part2.scala b/src/main/scala/org/codefork/aoc2018/Day10Part2.scala
@@ -5,8 +5,7 @@ import org.codefork.aoc2018.Day10.{CoordSet, getCoords}
 object Day10Part2 extends Part {
 
   override def answer: String = {
-    val (msg, coordSet) = Day10.findLetters(CoordSet(getCoords))
-    coordSet.t.toString
+    Day10.findLetters(CoordSet(getCoords)).t.toString
   }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ import org.codefork.aoc2018.Day10.{CoordSet, getCoords}`
`5`	`5`	`object Day10Part1 extends Part {`
`6`	`6`
`7`	`7`	`override def answer: String = {`
`8`		`- val (msg, coordSet) = Day10.findLetters(CoordSet(getCoords))`
`9`		`- "\n" + msg`
	`8`	`+ "\n" + Day10.findLetters(CoordSet(getCoords)).render`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@ import org.codefork.aoc2018.Day10.{CoordSet, getCoords}`
`5`	`5`	`object Day10Part2 extends Part {`
`6`	`6`
`7`	`7`	`override def answer: String = {`
`8`		`- val (msg, coordSet) = Day10.findLetters(CoordSet(getCoords))`
`9`		`- coordSet.t.toString`
	`8`	`+ Day10.findLetters(CoordSet(getCoords)).t.toString`
`10`	`9`	`}`
`11`	`10`
`12`	`11`	`}`