cosmetics

Author: anight

2020/day02/run.py

@@ -11,7 +11,7 @@ def all_passwords():
 valid = 0
 for n_from, n_to, char, passwd in all_passwords():
 	n = passwd.count(char)
-	if n >= n_from and n <= n_to:
+	if n_from <= n <= n_to:
 		valid += 1
 
 print(valid)

2020/day04/run.py

@@ -39,10 +39,10 @@ def valid(p):
 for p in load_passports('input.txt'):
 	def valid(p):
 		constraints = {
-			'byr': (r'^(\d{4})$', lambda g: int(g[0]) >= 1920 and int(g[0]) <= 2002),
-			'iyr': (r'^(\d{4})$', lambda g: int(g[0]) >= 2010 and int(g[0]) <= 2020),
-			'eyr': (r'^(\d{4})$', lambda g: int(g[0]) >= 2020 and int(g[0]) <= 2030),
-			'hgt': (r'^(\d+)(in|cm)$', lambda g: int(g[0]) >= {'in': 59, 'cm': 150}[g[1]] and int(g[0]) <= {'in': 76, 'cm': 193}[g[1]]),
+			'byr': (r'^(\d{4})$', lambda g: 1920 <= int(g[0]) <= 2002),
+			'iyr': (r'^(\d{4})$', lambda g: 2010 <= int(g[0]) <= 2020),
+			'eyr': (r'^(\d{4})$', lambda g: 2020 <= int(g[0]) <= 2030),
+			'hgt': (r'^(\d+)(in|cm)$', lambda g: {'in': 59, 'cm': 150}[g[1]] <= int(g[0]) <= {'in': 76, 'cm': 193}[g[1]]),
 			'hcl': (r'^#[\da-f]{6}$', None),
 			'ecl': (r'^(amb|blu|brn|gry|grn|hzl|oth)$', None),
 			'pid': (r'^\d{9}$', None),

2020/day05/run.py

@@ -23,7 +23,7 @@ def calc_id(seat):
 print(highest_id)
 
 # Part Two
-all_seats = dict( (id, True) for id in range(highest_id+1) )
+all_seats = { id: True for id in range(highest_id+1) }
 for seat in load_data('input.txt'):
 	id = calc_id(seat)
 	del all_seats[id]

2020/day15/run.py

@@ -3,7 +3,7 @@
 input = "20,9,11,0,1,2"
 
 spoken = list(map(int, input.split(',')))
-last = dict((n, i) for i, n in enumerate(spoken[:-1]))
+last = { n: i for i, n in enumerate(spoken[:-1]) }
 
 def play(limit):
 	while len(spoken) < limit:

2020/day16/run.py

@@ -11,7 +11,7 @@ def load_data(filename):
 				break
 			name, ranges = line.split(': ')
 			ranges = ranges.split(' or ')
-			s = set([])
+			s = set()
 			for r in ranges:
 				numbers = r.split('-')
 				s |= set(range(int(numbers[0]), int(numbers[1])+1))
@@ -34,7 +34,7 @@ def load_data(filename):
 
 rules, my_ticket, nearby_tickets = load_data('input.txt')
 
-all_rules = set([])
+all_rules = set()
 for _, valid_numbers in rules:
 	all_rules |= valid_numbers
 
@@ -53,7 +53,7 @@ def load_data(filename):
 field_map = {}
 nearby_tickets = np.array(nearby_tickets)
 for rule_no, (name, s) in enumerate(rules):
-	possible_fields = set([])
+	possible_fields = set()
 	for field_no in range(nearby_tickets.shape[1]):
 		if all( x in s for x in nearby_tickets[:,field_no] ):
 			possible_fields |= set([field_no])

2020/day21/run.py

@@ -8,7 +8,7 @@ def load_food():
 			allergens = set(tokens[1].strip(')\n').split(', '))
 			yield ingredients, allergens
 
-ingredients_with_allergens = set([])
+ingredients_with_allergens = set()
 all_ingredients = []
 known_allergens = {}
 allergens_candidates = {}

2021/day17/run.py

@@ -12,7 +12,7 @@ def launch(vx, vy):
 		y += vy
 		if highest_y < y:
 			highest_y = y
-		if x >= target['x_from'] and x <= target['x_to'] and y >= target['y_from'] and y <= target['y_to']:
+		if target['x_from'] <= x <= target['x_to'] and target['y_from'] <= y <= target['y_to']:
 			return True, highest_y
 		if y < target['y_from']:
 			return False, highest_y

2021/day22/run.py

@@ -42,9 +42,9 @@ def set(self, new_aabb, v):
 				if stop <= new_start or new_stop <= start:
 					skip = True
 				elif stop > new_stop or start < new_start:
-					if start < new_start and stop > new_start:
+					if start < new_start < stop:
 						cuts.append(aabb[:j] + [ (start, new_start) ] + aabb[j+1:])
-					if stop > new_stop and start < new_stop:
+					if start < new_stop < stop:
 						cuts.append(aabb[:j] + [ (new_stop, stop) ] + aabb[j+1:])
 					aabb[j] = ( max(start, new_start), min(stop, new_stop) )
 			if skip:

2021/day24/run.py

@@ -21,7 +21,7 @@ def __init__(self):
 		self.input = None
 
 	def reset(self):
-		self.values = dict(zip(self.regs, [0] * len(self.regs)))
+		self.values = { reg: 0 for reg in self.regs }
 
 	def load(self, code):
 		self.code = code

2022/day03/run.py

@@ -9,9 +9,9 @@ def load_data(filename):
 # Part One
 
 def priority(char):
-	if char >= 'a' and char <= 'z':
+	if 'a' <= char <= 'z':
 		return ord(char) - ord('a') + 1
-	if char >= 'A' and char <= 'Z':
+	if 'A' <= char <= 'Z':
 		return ord(char) - ord('A') + 27
 
 total = 0

2022/day15/run.py

@@ -14,7 +14,7 @@ def load_data(filename):
 from itertools import pairwise, product
 
 the_row = 2_000_000
-beacons_in_the_row = set([])
+beacons_in_the_row = set()
 all_intervals = []
 for (sx, sy), (bx, by) in load_data('input.txt'):
 	if by == the_row:
@@ -43,7 +43,7 @@ def load_data(filename):
 for f, t in all_intervals:
 	r = t - f + 1
 	for bx in beacons_in_the_row:
-		if bx >= f and bx <= t:
+		if f <= bx <= t:
 			r -= 1
 	total += r
 

2022/day18/run.py

@@ -36,14 +36,14 @@ def neighbours(x, y, z):
 
 def isolated(x, y, z):
 	visited = { (x, y, z): None }
-	lookup = dict( (c, None) for c in neighbours(x, y, z) if c not in cubes )
+	lookup = { c: None for c in neighbours(x, y, z) if c not in cubes }
 	while len(lookup) > 0:
 		x, y, z = next(iter(lookup))
 		del lookup[ (x, y, z) ]
 		visited[ (x, y, z) ] = None
 		if x in (minx, maxx) or y in (miny, maxy) or z in (minz, maxz):
 			return False
-		lookup.update( (c, None) for c in neighbours(x, y, z) if c not in cubes and c not in visited and c not in lookup )
+		lookup |= { c: None for c in neighbours(x, y, z) if c not in cubes and c not in visited and c not in lookup }
 	return True
 
 cubes_isolated = []

2022/day23/run.py

@@ -68,7 +68,7 @@ def planned(x, y, i):
 i += 1
 
 while True:
-	new_elves, _, _ = next_state(i, elves)
+	new_elves, *_ = next_state(i, elves)
 	i += 1
 	if new_elves == elves:
 		break

2022/day24/run.py

@@ -42,7 +42,7 @@ def can_walk(x, y, t):
 				return False
 			return True
 		for (nx, ny, nt) in possible_moves:
-			if nx >= 0 and nx < w and ny >= 0 and ny < h and nt < max_minutes:
+			if 0 <= nx < w and 0 <= ny < h and nt < max_minutes:
 				if can_walk(nx, ny, nt):
 					yield (nx, ny, nt), 1