Last minute tweaks to Day 5, and completed Day 6

Author: truffle0

Day5/almanac.py

@@ -70,8 +70,8 @@ def generator() -> Generator[int, int, None]:
 					# Stay here while i is in the current range
 					while i in cur_range:
 						i = yield i + offset
-				elif i < start(cur_range) and i >= end(prev):
-					while i < start(cur_ranges) and i >= end(prev):
+				elif i < start(cur_range) and (prev is None or i >= end(prev)):
+					while i < start(cur_range) and (prev is None or i >= end(prev)):
 						i = yield i
 				elif i >= end(cur_range):
 					if cur_range == ranges.end[0]:
@@ -80,9 +80,6 @@ def generator() -> Generator[int, int, None]:
 					else:
 						prev = cur_range
 						cur_range, offset = ranges.next()
-				elif prev is None:
-					while i < start(cur_range):
-						i = yield i
 				elif i < end(prev):
 					cur_range, offset = ranges.prev()
 					prev = None if ranges.last() is None else ranges.last()[0]
@@ -251,7 +248,7 @@ def part_two(source:str) -> int:
 
 	total = sum(len(ran) for ran in ranges)
 	result = min(converter.send(i)
-		for i in tqdm(chain(*ranges), total=total, desc="Maps"))
+		for i in tqdm(chain(*ranges), total=total, desc="Maps", leave=False))
 
 	# Return the minimum value
 	return result

Day6/input.txt

@@ -0,0 +1,2 @@
+Time:        63     78     94     68
+Distance:   411   1274   2047   1035

Day6/race.py

@@ -0,0 +1,52 @@
+import re
+from sys import argv, stdin
+from math import prod
+
+def win_races(time:int, record:int) -> int:
+    # charge = time spent charging = speed of the boat
+    # charge - time = remaining time
+    distances = [ (time - charge) * charge for charge in range(0, time) ]
+
+    # collect elements that pass the record and return the number
+    return sum(x > record for x in distances)
+
+def parse_config(source) -> list[tuple[int, int]]:
+    re_time = re.compile(r"^Time:\s+((?:\d+\s*)+)", re.MULTILINE)
+    re_distance = re.compile(r"^Distance:\s+((?:\d+\s*)+)", re.MULTILINE)
+    re_int = re.compile(r"(\d+)")
+
+    times = re.findall(re_int, ' '.join(re.findall(re_time, source)))
+    distances = re.findall(re_int, ' '.join(re.findall(re_distance, source)))
+    
+    races = zip(times, distances)
+    return list(races)
+
+def part_one(races: list[tuple[int, int]]) -> int:
+    return prod(win_races(int(time), int(record)) for time, record in races)
+
+def part_two(races: list[tuple[int, int]]) -> int:
+    # Unpack tuples in the list, assign them to variables,
+    # concatenate into a single string, then convert to an int
+    time, record = zip(*races)
+    time = int(''.join(time))
+    record = int(''.join(record))
+
+    return win_races(time, record)
+
+if __name__ == "__main__":
+    if len(argv) < 2 or argv[1] == '-':
+        print(f"Reading from stdin")
+        text = stdin.read()
+    else:
+        try:
+            with open(argv[1]) as f:
+                print(f"Reading from {argv[1]}")
+                text = f.read()
+        except FileNotFoundError:
+            print(f"Unable to find file: {argv[1]}")
+            exit(1)
+    
+    races = parse_config(text)
+
+    print(f"Part 1: {part_one(races)}")
+    print(f"Part 2: {part_two(races)}")

README.md

@@ -36,5 +36,15 @@ Language: **Rust**
 ---
 #### [Day 5](https://adventofcode.com/2023/day/5)
 Language: **Python**
+
+[almanac.py](Day5/almanac.py) < [input.txt](Day5/input.txt)
 - [x] Part 1: 1181555926
-- [x] Part 2: 37806486  (function runtime was about 4 hours ;-;)
+- [x] Part 2: 37806486  (function runtime was about 4 hours ;-;)
+
+---
+#### [Day 6](https://adventofcode.com/2023/day/6)
+Language: **Python**
+
+[race.py](Day6/race.py) < [input.txt](Day6/input.txt)
+- [x] Part 1: 781200
+- [x] Part 2: 49240091