done with day12 part2

Author: spaenleh

README.md

@@ -19,7 +19,7 @@ Below is my current advancement in Advent of code:
 | Day 9 | :star: (1h51) | :star: (43min) |
 | Day 10 | :star: (28min) | :star: (3min) |
 | Day 11 | :star: (28min) | :star: (1min) |
-| Day 12 | :star: |  |
+| Day 12 | :star: | :star: |
 | Day 13 | :star: | :star: (5min) |
 | Day 14 |  |  |
 | Day 15 |  |  |

Sources/AdventOfCode.swift

@@ -3,16 +3,16 @@ import ArgumentParser
 // Add each new day implementation to this array:
 let allChallenges: [any AdventDay] = [
   Day01(),
-  // Day02(),
-  // Day03(),
-  // Day04(),
-  // Day05(),
-  // Day06(),
-  // Day07(),
-  // Day08(),
-  // Day09(),
-  // Day10(),
-  // Day11(),
+  Day02(),
+  Day03(),
+  Day04(),
+  Day05(),
+  Day06(),
+  Day07(),
+  Day08(),
+  Day09(),
+  Day10(),
+  Day11(),
   Day12(),
   Day13(),
 ]

Sources/Day12.swift

@@ -24,7 +24,6 @@ enum Border: Hashable {
     case .west: .west
     }
   }
-
 }
 
 enum CardDirection: Int, CustomStringConvertible {
@@ -36,7 +35,6 @@ enum CardDirection: Int, CustomStringConvertible {
     case .west: "W"
     }
   }
-
   case north = 0
   case east
   case south
@@ -47,7 +45,6 @@ struct Side: CustomStringConvertible {
   var description: String {
     "Side(\(direction)|\(border) \(values))"
   }
-
   var direction: CardDirection
   var border: Border
   var values: [Int]
@@ -60,34 +57,15 @@ struct Field {
   var coords: [Coord] = [Coord]()
   var sides: [Border: [Int]] = [Border: [Int]]()
   var sideCount: Int {
-    let allSides = sides.values.map { side in
+    let allSides = sides.map { (border, side) in
       let sortedSide = side.sorted()
-      print("sorted", sortedSide)
-      return zip(sortedSide, sortedSide.dropFirst()).map { $1 - $0 }.filter { $0 > 1 }.count + 1
+      let diffs = zip(sortedSide, sortedSide.dropFirst()).map { $1 - $0 }
+      let nbSides = diffs.filter { $0 > 1 }.count + 1
+      return nbSides
     }
-    print("allsides", allSides)
-    return allSides.compactMap { $0 }.count
+    return allSides.sum
   }
 
-  // mutating func extendSides(idx: Int, pos: Coord) {
-  //   let (border, otherAxis) = Border.create(direction: idx, coord: pos)
-  //   let sideIdx = sides.firstIndex { side in
-  //     if side.direction == border.toCardDirection() && side.border == border {
-  //       let max = side.values.max() ?? -1
-  //       let min = side.values.min() ?? -1
-  //       if max + 1 == otherAxis || min - 1 == otherAxis {
-  //         return true
-  //       }
-  //     }
-  //     return false
-  //   }
-  //   if let sideIdx {
-  //     sides[sideIdx].values.append(otherAxis)
-  //   } else {
-  //     sides.append(Side(direction: border.toCardDirection(), border: border, values: [otherAxis]))
-  //   }
-  // }
-
   mutating func addSide(idx: Int, pos: Coord) {
     let (border, otherAxis) = Border.create(direction: idx, coord: pos)
     sides[border, default: []].append(otherAxis)
@@ -136,15 +114,11 @@ struct Day12: AdventDay {
           // this is a frontier
           field.perimeter += 1
           field.addSide(idx: idx, pos: neighbor)
-          // print("border found at", pos)
-          // print(field.sides)
         }
       } else {
         // this is the frontier of the grid
         field.perimeter += 1
         field.addSide(idx: idx, pos: neighbor)
-        // print(field.sideCount)
-
       }
     }
     return field
@@ -160,7 +134,6 @@ struct Day12: AdventDay {
         guard record[currentPos] == nil else {
           continue
         }
-
         if let gridValue = grid[currentPos] {
           // start a new field
           let field = exploreField(
@@ -169,22 +142,17 @@ struct Day12: AdventDay {
           field.coords.forEach { s in
             record[s] = true
           }
-          print("sides of ", gridValue, field.sideCount)
         }
       }
     }
     return fields
   }
 
   func part1() -> Int {
-
     return getFields().map { $0.compute1() }.sum
   }
 
   func part2() -> Int {
-    // merge sides that are next to each other
-
     return getFields().map { $0.compute2() }.sum
-
   }
 }

Tests/Day12.swift

@@ -59,7 +59,6 @@ struct Day12Tests {
           EEEC
           """
       ).part2() == 80)
-    print("------")
     #expect(
       Day12(
         data: """
@@ -80,7 +79,7 @@ struct Day12Tests {
           ABBAAA
           AAAAAA
           """
-      ).part2() == 236)
+      ).part2() == 368)
   }
 
   @Test("part2")