optimize and cleanup code from previous days

Author: spaenleh

Sources/Data/outputDay2.txt

@@ -0,0 +1 @@
+[true, true, true, true, true, false, false, false, false, true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, false, false, false, false, true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, false, false, false, false, true, false, false, false, false, false, true, false, false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, true, true, true, true, false, false, true, false, true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, true, false, false, false, false, true, false, false, false, false, false, false, true, false, false, false, false, false, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true, true]

Sources/Day00.swift

@@ -1,11 +1,8 @@
 import Algorithms
 
 struct Day00: AdventDay {
-  // Save your data in a corresponding text file in the `Data` directory.
   var data: String
 
-  // add here any computed values useful for the challenge
-
   func part1() -> Int {
     0
   }

Sources/Day02.swift

@@ -1,18 +1,5 @@
 import Algorithms
 
-struct Report {
-  var value: [Int]
-}
-extension Report {
-  init(_ data: Substring) {
-    value = data.split(separator: " ").map { v in Int(v) ?? 0 }
-  }
-}
-
-func spreadsWell(_ value: Int) -> Bool {
-  abs(value) <= 3 && abs(value) >= 1
-}
-
 func getPermutationsExcludingOneElement(_ arr: [Int]) -> [[Int]] {
   var perms = [[Int]]()
   for idx in 0..<arr.count {
@@ -23,50 +10,45 @@ func getPermutationsExcludingOneElement(_ arr: [Int]) -> [[Int]] {
   return perms
 }
 
-struct ReportAnalyzer {
-
-  func isSafe(report: Report, damped: Bool = false) -> Bool {
-    // all values are either increasing or decreasing
-    let diffs = report.value.adjacentPairs().map { (one, two) in
-      two - one
+func isSafe(_ report: [Int], damped: Bool = false) -> Bool {
+  // all values are either increasing or decreasing
+  let diffs = report.adjacentPairs().map { $1 - $0 }
+  let order = diffs.grouped { v in
+    if v < 0 {
+      return "desc"
     }
-    let order = diffs.grouped { v in
-      if v < 0 {
-        return "desc"
-      }
-      if v > 0 {
-        return "asc"
-      }
-      return "none"
+    if v > 0 {
+      return "asc"
     }
-    let spread = diffs.filter { spreadsWell($0) }
-
-    let isSafe = order.count == 1 && spread.count == diffs.count
-    if damped && !isSafe {
-      let reportPermutations = getPermutationsExcludingOneElement(report.value)
-      let isAnySafe =
-        reportPermutations.map {
-          return ReportAnalyzer().isSafe(report: Report(value: Array($0)))
-        }.filter { $0 }.count >= 1
-      return isAnySafe
-    }
-    return isSafe
+    return "none"
+  }
+  // compute the differences
+  let acceptableDifferences = diffs.filter { abs($0) <= 3 && abs($0) >= 1 }
+  let isReportSafe = order.count == 1 && acceptableDifferences.count == diffs.count
+
+  if damped && !isReportSafe {
+    let reportPermutations = getPermutationsExcludingOneElement(report)
+    let isAnySafe =
+      reportPermutations.map {
+        return isSafe($0)
+      }.filter { $0 }.count >= 1
+    return isAnySafe
   }
+  return isReportSafe
 }
 
 struct Day02: AdventDay {
-  // Save your data in a corresponding text file in the `Data` directory.
   var data: String
 
-  var reports: [Report] {
-    data.split(separator: "\n").map { Report($0) }
+  var reports: [[Int]] {
+    data.lines().map { $0.integers() }
   }
 
   func part1() -> Int {
-    reports.map { ReportAnalyzer().isSafe(report: $0) }.filter { $0 }.count
+    reports.map { isSafe($0) }.count(where: { $0 == true })
   }
 
   func part2() -> Int {
-    reports.map { ReportAnalyzer().isSafe(report: $0, damped: true) }.filter { $0 }.count
+    reports.map { isSafe($0, damped: true) }.count { $0 == true }
   }
 }

Sources/Array+Utils.swift renamed to Sources/Extensions/Array+Utils.swift

@@ -15,8 +15,7 @@ struct Day02Tests {
 
   @Test("report analyzer")
   func name() async throws {
-    #expect(Report("7 6 4 2 1").value == [7, 6, 4, 2, 1])
-    #expect(ReportAnalyzer().isSafe(report: Report("7 6 4 2 1")) == true)
+    #expect(isSafe("7 6 4 2 1".integers()) == true)
   }
 
   @Test("part1")