consolidate parts, bench p2

This commit is contained in:
Luke Hubmayer-Werner 2022-12-19 01:22:49 +10:30
parent 350380f4b4
commit ca78b6d7c6
1 changed files with 25 additions and 26 deletions

View File

@ -18,32 +18,15 @@ sample_coords = [tuple(line_to_numbers(line)) for line in '''
2,3,5 2,3,5
'''.strip().split('\n')] '''.strip().split('\n')]
def count_faces(coords: list[tuple[int,int,int]]): def count_faces(coords: list[tuple[int,int,int]], count_gaps=True):
# print(coords)
surface_area = 0
for (x,y,z) in coords:
if (x+1,y,z) not in coords:
surface_area += 1
if (x-1,y,z) not in coords:
surface_area += 1
if (x,y+1,z) not in coords:
surface_area += 1
if (x,y-1,z) not in coords:
surface_area += 1
if (x,y,z+1) not in coords:
surface_area += 1
if (x,y,z-1) not in coords:
surface_area += 1
return surface_area
print(f'Part 1 (sample): {count_faces(sample_coords)}')
print(f'Part 1: {count_faces(coords)}')
def count_faces_2(coords: list[tuple[int,int,int]]):
# we pad to ensure the outer edges are fine # we pad to ensure the outer edges are fine
field = np.zeros((25,25,25), dtype=np.int8) field = np.full((25,25,25), -1 if count_gaps else 0, dtype=np.int8)
# indices = np.array(coords, dtype=np.int8).T + 1
# field[*indices] = 1
for (x,y,z) in coords: for (x,y,z) in coords:
field[x+1,y+1,z+1] = 1 field[x+1,y+1,z+1] = 1
if not count_gaps:
field[flood(field, (0,0,0), connectivity=1)] = -1 field[flood(field, (0,0,0), connectivity=1)] = -1
surface_area = np.logical_and(field[:-1,:,:] == 1, field[1:,:,:] == -1).sum() surface_area = np.logical_and(field[:-1,:,:] == 1, field[1:,:,:] == -1).sum()
@ -54,6 +37,22 @@ def count_faces_2(coords: list[tuple[int,int,int]]):
surface_area += np.logical_and(field[:,:,1:] == 1, field[:,:,:-1] == -1).sum() surface_area += np.logical_and(field[:,:,1:] == 1, field[:,:,:-1] == -1).sum()
return surface_area return surface_area
print(f'Part 1 (sample): {count_faces(sample_coords)}')
print(f'Part 1: {count_faces(coords)}')
print(f'Part 2 (sample): {count_faces_2(sample_coords)}')
print(f'Part 2: {count_faces_2(coords)}') print(f'Part 2 (sample): {count_faces(sample_coords, False)}')
t0 = perf_counter_ns()
print(f'Part 2: {count_faces(coords, False)}')
t1 = perf_counter_ns()
for i in range(1000):
count_faces(coords, False)
t2 = perf_counter_ns()
for i in range(10000):
count_faces(coords, False)
t3 = perf_counter_ns()
print(f'Part 2 x1: {(t1-t0)/1000_000:.3f}ms')
print(f'Part 2 x1000: {(t2-t1)/1000_000:.3f}ms')
print(f'Part 2 x10000: {(t3-t2)/1000_000:.3f}ms')