add ZGrid.zball convenience

wimglenn · Jan 4, 2025 · 60e5059 · 60e5059
1 parent 3849994
commit 60e5059
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/aoc_wim/aoc2024/q20.py b/aoc_wim/aoc2024/q20.py
@@ -5,7 +5,6 @@
 from aocd import data
 from aocd import extra
 
-from aoc_wim.zgrid import manhattan_ball
 from aoc_wim.zgrid import ZGrid
 
 
@@ -28,7 +27,7 @@ def n_cheats(t_cheat, dt_min):
     result = 0
     for z0, d in path.items():
         for r in range(1, t_cheat + 1):
-            for z in manhattan_ball(r, z0):
+            for z in grid.zball(z0, r):
                 if z in path:
                     result += d - r - path[z] >= dt_min
     return result

diff --git a/aoc_wim/zgrid.py b/aoc_wim/zgrid.py
@@ -15,7 +15,8 @@ def manhattan_distance(z1, z0=0):
     return abs(int(dz.real)) + abs(int(dz.imag))
 
 
-def manhattan_ball(r=1, z0=0, full=False):
+def manhattan_ball(z0=0, r=1, full=False):
+    """circle/ball centered on z0 with radius r (using manhattan distance)"""
     result = []
     if full:
         result.append(0)
@@ -177,6 +178,8 @@ def remove(self, val):
         self.d.update(keep)
         return n_removed
 
+    zball = staticmethod(manhattan_ball)
+
     @staticmethod
     def near(z, n=4):
         if n == 4: