day11: slightly faster (and actually correct)
This commit is contained in:
parent
ef7fb6e53e
commit
4dc83760b7
43
day11.py
43
day11.py
@ -6,6 +6,7 @@ DAY = 11
|
||||
TEST_SOLUTION_PART1 = 37
|
||||
TEST_SOLUTION_PART2 = 26
|
||||
INT_INDEX = ['L', '#', '.']
|
||||
MAP_INDEX = [False, True, None]
|
||||
|
||||
|
||||
def printLayout(layout, max_x, max_y):
|
||||
@ -17,20 +18,21 @@ def printLayout(layout, max_x, max_y):
|
||||
|
||||
|
||||
def prepareLayout(raw_input):
|
||||
int_layout = defaultdict(lambda: 2)
|
||||
int_layout = defaultdict(lambda: None)
|
||||
for y, line in enumerate(raw_input):
|
||||
for x, char in enumerate(line):
|
||||
int_layout[(x, y)] = INT_INDEX.index(char)
|
||||
int_layout[(x, y)] = MAP_INDEX[INT_INDEX.index(char)]
|
||||
|
||||
return int_layout
|
||||
|
||||
|
||||
def simulate(layout, max_x, max_y, wide=False):
|
||||
num_seats_occupied = 0
|
||||
new_layout = defaultdict(lambda: 2)
|
||||
max_seats_occupied = (5 if wide else 4)
|
||||
max_xy = max(max_x, max_y)
|
||||
new_layout = defaultdict(lambda: None)
|
||||
for x in range(0, max_x):
|
||||
for y in range(0, max_y):
|
||||
if layout[(x, y)] == 2:
|
||||
if layout[(x, y)] is None:
|
||||
continue
|
||||
|
||||
occupied_seats = 0
|
||||
@ -38,29 +40,28 @@ def simulate(layout, max_x, max_y, wide=False):
|
||||
for cy in [-1, 0, 1]:
|
||||
if cx == 0 and cy == 0:
|
||||
continue
|
||||
|
||||
if not wide:
|
||||
if layout[(x + cx, y + cy)] == 1:
|
||||
if layout[(x + cx, y + cy)]:
|
||||
occupied_seats += 1
|
||||
else:
|
||||
for d in range(1, max(max_x, max_y)):
|
||||
if d * cy + y >= max_x or d * cx + x >= max_y:
|
||||
for d in range(1, max_xy):
|
||||
test_x = d * cx + x
|
||||
test_y = d * cy + y
|
||||
if test_x >= max_x or test_y >= max_y:
|
||||
break
|
||||
if layout[(d * cx + x, d * cy + y)] == 2:
|
||||
if layout[(test_x, test_y)] is None:
|
||||
continue
|
||||
if layout[(d * cx + x, d * cy + y)] < 2:
|
||||
occupied_seats += layout[(d * cx + x, d * cy + y)]
|
||||
else:
|
||||
occupied_seats += layout[(test_x, test_y)]
|
||||
break
|
||||
|
||||
if layout[(x, y)] and occupied_seats >= (5 if wide else 4):
|
||||
new_layout[(x, y)] = 0
|
||||
elif not layout[(x, y)] and occupied_seats == 0:
|
||||
new_layout[(x, y)] = 1
|
||||
if (layout[(x, y)] and occupied_seats >= max_seats_occupied) or (not layout[(x, y)] and occupied_seats == 0):
|
||||
new_layout[(x, y)] = not layout[(x, y)]
|
||||
else:
|
||||
new_layout[(x, y)] = layout[(x, y)]
|
||||
|
||||
num_seats_occupied += new_layout[(x, y)]
|
||||
|
||||
return new_layout, num_seats_occupied
|
||||
return new_layout
|
||||
|
||||
|
||||
def part1(test_mode=False, wide=False):
|
||||
@ -71,10 +72,14 @@ def part1(test_mode=False, wide=False):
|
||||
cellcount_y = len(my_input)
|
||||
curr_occupied = 0
|
||||
last_occupied = -1
|
||||
generation_counter = 0
|
||||
while curr_occupied != last_occupied:
|
||||
last_occupied = curr_occupied
|
||||
curr_layout, curr_occupied = simulate(curr_layout, cellcount_x, cellcount_y, wide)
|
||||
generation_counter += 1
|
||||
curr_layout = simulate(curr_layout, cellcount_x, cellcount_y, wide)
|
||||
curr_occupied = sum(filter(None, curr_layout.values()))
|
||||
|
||||
print("Generations simulated: %d" % generation_counter)
|
||||
return curr_occupied
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user