chore: reformat scala since did not touch this for months

Author: markkovari

2023/src/main/scala/day01.scala …/com/markkovari/adventofcode/day01.scala2023/src/main/scala/day01.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day01.scala 2023/src/main/scala/day01.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day01.scala

@@ -1,7 +1,6 @@
 package com.markkovari.adventofcode.day01
 
 import scala.collection.immutable.HashMap
-import scala.io.Source
 
 val numbersAsStringsAndValues =
   HashMap(
@@ -16,7 +15,7 @@ val numbersAsStringsAndValues =
     "nine" -> 9
   )
 
-def stringStartsStringifiedDigit(text: String): Option[Int] =
+def stringStartsStringifyDigit(text: String): Option[Int] =
   numbersAsStringsAndValues
     .find { case (key, _) => text.startsWith(key) }
     .map { case (_, value) => value }
@@ -32,7 +31,7 @@ def getFirstAndLastMultipliedTen(list: List[Int]): Int =
 def getMixedUpDigits(of: String): List[Int] = of match {
   case "" => List()
   case other =>
-    stringStartsStringifiedDigit(other) match {
+    stringStartsStringifyDigit(other) match {
       case Some(value) => value :: getMixedUpDigits(other.splitAt(1)._2)
       case None =>
         val (head, tail) = other.splitAt(1)

2023/src/main/scala/day02.scala …/com/markkovari/adventofcode/day02.scala2023/src/main/scala/day02.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day02.scala 2023/src/main/scala/day02.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day02.scala

@@ -4,18 +4,18 @@ import scala.util.matching.Regex.Match
 
 case class Detail(content: String, x: Int, y: Int)
 
-case class Coord(x: Int, y: Int):
-  def within(start: Coord, end: Coord) =
+case class Coordinate(x: Int, y: Int):
+  def within(start: Coordinate, end: Coordinate) =
     if y < start.y || y > end.y then false
     else if x < start.x || x > end.x then false
     else true
 
-case class PartNumber(value: Int, start: Coord, end: Coord)
+case class PartNumber(value: Int, start: Coordinate, end: Coordinate)
 
-case class Symbol(sym: String, pos: Coord):
+case class Symbol(sym: String, pos: Coordinate):
   def neighborOf(number: PartNumber) = pos.within(
-    Coord(number.start.x - 1, number.start.y - 1),
-    Coord(number.end.x + 1, number.end.y + 1)
+    Coordinate(number.start.x - 1, number.start.y - 1),
+    Coordinate(number.end.x + 1, number.end.y + 1)
   )
 
 object IsInt:
@@ -33,8 +33,8 @@ def findPartsAndSymbols(
         .findAllMatchIn(line)
         .map:
           case m @ IsInt(nb) =>
-            PartNumber(nb, Coord(m.start, i), Coord(m.end - 1, i))
-          case s => Symbol(s.matched, Coord(s.start, i))
+            PartNumber(nb, Coordinate(m.start, i), Coordinate(m.end - 1, i))
+          case s => Symbol(s.matched, Coordinate(s.start, i))
 
 def part1(input: String) =
   val all = findPartsAndSymbols(input)

2023/src/main/scala/day03.scala …/com/markkovari/adventofcode/day03.scala2023/src/main/scala/day03.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day03.scala 2023/src/main/scala/day03.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day03.scala

@@ -1,7 +1,5 @@
 package com.markkovari.adventofcode.day04
 
-import scala.util.matching.Regex.Match
-
 case class Card(id: Int, numbers: List[Int], winningNumbers: List[Int]) {
   private def matches(): Set[Int] = {
     numbers.toSet.intersect(winningNumbers.toSet)
@@ -17,8 +15,8 @@ def parseCard(input: String): Card =
     case s"Card ${id}: ${numbers} | ${winningNumbers}" =>
       Card(
         id.trim().toInt,
-        numbers.split(" ").filter(!_.isEmpty).map(_.toInt).toList,
-        winningNumbers.split(" ").filter(!_.isEmpty).map(_.toInt).toList
+        numbers.split(" ").filter(_.nonEmpty).map(_.toInt).toList,
+        winningNumbers.split(" ").filter(_.nonEmpty).map(_.toInt).toList
       )
   }
 
@@ -44,9 +42,9 @@ def countWinning(card: String): Int =
     .substring(card.indexOf(":") + 1)
     .split(" ")
     .filterNot(_.isEmpty())
-  val (winningNumberStrs, givenNumberStrs) = numbers.span(_ != "|")
-  val winningNumbers = winningNumberStrs.map(_.toInt).toSet
-  val givenNumbers = givenNumberStrs.drop(1).map(_.toInt).toSet
+  val (winningNumberStrings, givenNumberStrings) = numbers.span(_ != "|")
+  val winningNumbers = winningNumberStrings.map(_.toInt).toSet
+  val givenNumbers = givenNumberStrings.drop(1).map(_.toInt).toSet
   winningNumbers.intersect(givenNumbers).size
 
 def winningCounts(input: String): Iterator[Int] =
@@ -56,7 +54,7 @@ def part1_(input: String): String =
   winningCounts(input)
     .map(winning => if winning > 0 then Math.pow(2, winning - 1).toInt else 0)
     .sum
-    .toString()
+    .toString
 
 def part2_(input: String): String =
   winningCounts(input)
@@ -70,4 +68,4 @@ def part2_(input: String): String =
       (numCards + thisMult, restMult)
     }
     ._1
-    .toString()
+    .toString

2023/src/main/scala/day04.scala …/com/markkovari/adventofcode/day04.scala2023/src/main/scala/day04.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day04.scala 2023/src/main/scala/day04.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day04.scala

@@ -1,7 +1,5 @@
 package com.markkovari.adventofcode.day05
 
-import scala.util.matching.Regex.Match
-
 final case class Resource(start: Long, end: Long, kind: ResourceKind)
 
 enum ResourceKind:
@@ -98,12 +96,10 @@ object Seeds:
         .split(" ")
         .flatMap(_.toLongOption)
 
-  // parse seeds without range
   def parseWithoutRange(line: String): Seq[Resource] =
     parseSeedsRaw(line).map: start =>
       Resource(start, start, ResourceKind.Seed)
 
-  // parse seeds with range
   def parse(line: String): Seq[Resource] =
     parseSeedsRaw(line)
       .grouped(2)

2023/src/main/scala/day05.scala …/com/markkovari/adventofcode/day05.scala2023/src/main/scala/day05.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day05.scala 2023/src/main/scala/day05.scala renamed to 2023/src/main/scala/com/markkovari/adventofcode/day05.scala

@@ -0,0 +1,50 @@
+package com.markkovari.adventofcode
+
+import com.markkovari.adventofcode.day01.{getDigits, getFirstAndLastMultipliedTen, getMixedUpDigits}
+import org.scalatest.funsuite.AnyFunSuite
+
+import scala.io.Source
+import scala.util.Using
+
+class Day01Tests extends AnyFunSuite {
+
+  private val exampleFilename = "example_1"
+  private val exampleFilename2 = "example_2"
+  private val valuesFilename = "values"
+
+  test("example result is the same as in the description") {
+    Using(Source.fromFile(s"./src/test/resources/1/${exampleFilename}")) {
+      source =>
+        val lines = source.getLines
+        val firstResult =
+          lines
+            .map(line => getFirstAndLastMultipliedTen(getDigits(line)))
+            .sum
+        assert(firstResult == 101)
+    }
+  }
+
+  test("result first part") {
+    Using(Source.fromFile(s"./src/test/resources/1/${valuesFilename}")) {
+
+      source =>
+        val lines = source.getLines
+
+        val firstResult =
+          lines
+            .map(line => getFirstAndLastMultipliedTen(getDigits(line)))
+            .sum
+        assert(firstResult == 54573)
+
+      val secondLines = source.getLines
+      val secondResult =
+        secondLines
+          .map(line => getFirstAndLastMultipliedTen(getMixedUpDigits(line)))
+          .sum
+
+      assert(secondResult == 54591)
+    }
+
+  }
+
+}

2023/src/test/scala/com/markkovari/adventofcode/Day01Tests.scala

@@ -1,9 +1,9 @@
 package com.markkovari.adventofcode
 
+import com.markkovari.adventofcode.day04.*
 import org.scalatest.funsuite.AnyFunSuite
+
 import scala.io.Source
-import scala.collection.immutable.HashMap
-import day04._
 
 class Day04Tests extends AnyFunSuite {
 

2023/src/test/scala/day02.scala …markkovari/adventofcode/Day02Tests.scala2023/src/test/scala/day02.scala renamed to 2023/src/test/scala/com/markkovari/adventofcode/Day02Tests.scala 2023/src/test/scala/day02.scala renamed to 2023/src/test/scala/com/markkovari/adventofcode/Day02Tests.scala

@@ -0,0 +1,42 @@
+package com.markkovari.adventofcode
+
+import com.markkovari.adventofcode.day05.*
+import org.scalatest.funsuite.AnyFunSuite
+
+import scala.io.Source
+import scala.util.Using
+
+class Day05Tests extends AnyFunSuite {
+
+  test("Part1 example") {
+    Using(io.Source.fromFile("./src/test/resources/5/example_1")) { source =>
+      val input = source.mkString
+      val result = part1(input)
+      assert(result == 35)
+    }
+  }
+
+  test("Part1 is calculated") {
+    Using(io.Source.fromFile("./src/test/resources/5/values")) { source =>
+      val input = source.mkString
+      val result = part1(input)
+      assert(result == 1182)
+    }
+  }
+
+  test("Part2 example") {
+    Using(io.Source.fromFile("./src/test/resources/5/example_1")) { source =>
+      val input = source.mkString
+      val result = part2(input)
+      assert(result == 8)
+    }
+  }
+
+  test("Part2 is calculated") {
+    Using(io.Source.fromFile("./src/test/resources/5/values")) { source =>
+      val input = source.mkString
+      val result = part2(input)
+      assert(result == 1181555926)
+    }
+  }
+}