From f41564d8f1d0d0641de54621c83ef973ce2c0c5b Mon Sep 17 00:00:00 2001
From: Dory <dory@dory.moe>
Date: Mon, 16 Dec 2024 11:07:30 -0800
Subject: [PATCH] more debugging printouts

---
 day15/d15p1.swift | 17 ++++++++---------
 day15/d15p2.swift | 14 +++++++++-----
 day16/d16p1.swift |  4 ++--
 day16/d16p2.swift |  1 +
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/day15/d15p1.swift b/day15/d15p1.swift
index aff907e..a3604a6 100644
--- a/day15/d15p1.swift
+++ b/day15/d15p1.swift
@@ -35,10 +35,13 @@ struct Map: CustomStringConvertible {
         var s: [[String]] = Array(
             repeating: Array(repeating: "  ", count: w*2), count: h
         )
-        walls.forEach { w in s[w.y][w.x] = "██" }
-        boxes.forEach { b in s[b.y][b.x] = "▒▒" }
-        s[bot.y][bot.x] = "🯅🯅"
-        return s.map { row in row.joined() }.joined(separator: "\n")
+        walls.forEach { w in s[w.y][w.x] = "🮘🮘" }
+        boxes.forEach { b in s[b.y][b.x] = "🬴🬸" }
+        s[bot.y][bot.x] = "\u{001B}[91m🮿 \u{001B}[0m"
+        return ("    " + (0..<w).map { " \($0 % 10)" }.joined() + "\n") +
+            s.enumerated().map {
+                i, row in String(format: "%3d ", i) + row.joined()
+            }.joined(separator: "\n")
     }
     var gps: Int { return boxes.reduce(0) { s, box in s + box.gps } }
 
@@ -67,13 +70,9 @@ struct Map: CustomStringConvertible {
             next = next.move(dir)
         }
         if !walls.contains(next) {
-            if !pushes.isEmpty { print("pushing box \(pushes)") }
             pushes.forEach { boxes.remove($0) }
             pushes.forEach { boxes.insert($0.move(dir)) }
             bot = bot.move(dir)
-            print("moving bot to \(bot)")
-        } else {
-            print("noop")
         }
     }
 }
@@ -90,7 +89,7 @@ var (map, moves) = try readInput(CommandLine.arguments[1])
 print(map)
 print(moves)
 for move in moves {
-    print(move)
+    //print(move)
     map.move(move)
 }
 print(map)
diff --git a/day15/d15p2.swift b/day15/d15p2.swift
index a004276..17e4424 100644
--- a/day15/d15p2.swift
+++ b/day15/d15p2.swift
@@ -44,10 +44,13 @@ struct Map: CustomStringConvertible {
         var s: [[String]] = Array(
             repeating: Array(repeating: "  ", count: w*2), count: h
         )
-        walls.forEach { w in s[w.y][w.x] = "██" }
-        boxes.boxes.forEach { b in s[b.y][b.x] = "🮇🮀"; s[b.y][b.x+1] = "🮀▌" }
-        s[bot.y][bot.x] = "🮕🮕"
-        return s.map { row in row.joined() }.joined(separator: "\n")
+        walls.forEach { w in s[w.y][w.x] = "🮘🮘" }
+        boxes.boxes.forEach { b in s[b.y][b.x] = "🬴🬰"; s[b.y][b.x+1] = "🬰🬸" }
+        s[bot.y][bot.x] = "\u{001B}[91m🮿 \u{001B}[0m"
+        return ("    " + (0..<2*w).map { " \($0 % 10)" }.joined() + "\n") +
+            s.enumerated().map {
+                i, row in String(format: "%3d ", i) + row.joined()
+            }.joined(separator: "\n")
     }
     var gps: Int { return boxes.boxes.reduce(0) { s, box in s + box.gps } }
 
@@ -106,10 +109,11 @@ func readInput(_ filePath: String) throws -> (Map, [Move]) {
 }
 
 var (map, moves) = try readInput(CommandLine.arguments[1])
-print(map)
 print(moves)
 for move in moves {
+    //print(map)
     map.move(move)
+    //print(move)
 }
 print(map)
 print(map.gps)
diff --git a/day16/d16p1.swift b/day16/d16p1.swift
index b381b74..48b5fd8 100644
--- a/day16/d16p1.swift
+++ b/day16/d16p1.swift
@@ -58,8 +58,8 @@ struct Maze : CustomStringConvertible {
         let s: [[String]] = walls.enumerated().map { i, r in
             [String(format: "%3d ", i)] + r.map { $0 ? "██" : "  " }
         }
-        print("    " + (0..<w).map { " \($0 % 10)" }.joined())
-        return s.map { $0.joined() }.joined(separator: "\n")
+        return ("    " + (0..<w).map { " \($0 % 10)" }.joined()) +
+            s.map { $0.joined() }.joined(separator: "\n")
     }
     init(fromFile f: String) throws {
         let content = try String(contentsOfFile: f, encoding: .ascii)
diff --git a/day16/d16p2.swift b/day16/d16p2.swift
index 20dbafe..03d9783 100644
--- a/day16/d16p2.swift
+++ b/day16/d16p2.swift
@@ -146,6 +146,7 @@ struct AoC {
     static func main() throws {
         let maze = try Maze(fromFile: CommandLine.arguments[1])
         let (graph, pathPairs) = maze.graph()
+        print("maze: \(maze.w)x\(maze.h) intersections: \(graph.count)")
         let visited = search(graph: graph, start: maze.start)
         let minCost = maze.ends.compactMap { visited[$0] }.map { $0.0 }.min()!
         print("minCost: \(minCost)")