🎉D5P2 done! also added some typing, docstrings, and changed p1 to use any and a few minor changes.

Author: bloopy-code

aoc_25/solutions/day05.py

@@ -1,10 +1,11 @@
 """Day 5 - Cafeteria"""
 
-from typing import Any
+from typing import Any, Iterator
 from utils.aoc_utils import report_results, AoCResult, input_for_day
 
 IngredientIds = list[int]
 FreshRanges = list[range]
+FreshRange = tuple[int, int]
 
 EXAMPLE: str = """3-5
 10-14
@@ -17,45 +18,106 @@
 11
 17
 32"""
-DATA = input_for_day(5, 2025)
+DATA: str = input_for_day(5, 2025)
 
 
 def parse_input(puzzle_input: str) -> tuple[FreshRanges, IngredientIds]:
-    ranges: FreshRanges = []
+    """Convert input of str.
+    Split on the \n\n, remove any \n from each line.
+    Then parse fresh ranges into list of ranges, and
+    ingredient ids into a list of ints.
+
+    Args:
+        puzzle_input (str): Puzzle input.
+
+    Returns:
+        tuple[FreshRanges, IngredientIds]: ranges of fresh ids, fresh ids.
+    """
     ranges_str, ingredient_ids_str = [
         x.splitlines() for x in puzzle_input.split('\n\n')
     ]
-    ranges = [
-        range(start, end + 1) for start, end in (map(int, r.split('-')) for r in ranges_str)
+    ranges: FreshRanges = [
+        range(start, end + 1) for start,
+        end in (map(int, r.split('-')) for r in ranges_str)
     ]
 
-    # ranges_ints = [list(map(int, r.split('-'))) for r in ranges_str]
-    # for rng in ranges_ints:
-    #     ranges.extend(list(range(rng[0], rng[1]+1)))
-
     ingredient_ids: IngredientIds = list(map(int, ingredient_ids_str))
     return ranges, ingredient_ids
 
 
-def solve_part1(data: Any) -> int:
+def merge_ranges(ranges: FreshRanges) -> Iterator[FreshRange]:
+    """Merge current ranges if overlap in any way.
+
+    Args:
+        ranges (FreshRanges): ranges of fresh ids
+
+    Yields:
+        Iterator[FreshRange]: merged ranges
+    """
+    # change ranges back to tuples of the start/stop
+    sorted_rngs: Iterator[FreshRange] = iter(
+        sorted((x.start, x.stop-1) for x in ranges)
+    )
+    start, end = next(sorted_rngs)  # get first fresh range
+
+    for s, e in sorted_rngs:
+        # if the next interval starts before/at current end
+        # they overlap so merge range by getting biggest end
+        if s <= end:
+            end = max(end, e)
+        else:
+            # if they dont overlap - start a new fresh range
+            # and yield the current one
+            yield (start, end)
+            start, end = s, e
+    yield start, end
+
+
+def solve_part2(ranges: FreshRanges) -> int:
+    """Sum up the merged range lengths
+
+    Args:
+        ranges (FreshRanges): fresh id ranges.
+
+    Returns:
+        int: sum of lengths of ranges.
+    """
+    # sum the lengths of each range
+    return sum(len(range(x[0], x[1]+1)) for x in merge_ranges(ranges))
+
+
+def solve_day05(data: Any) -> tuple[int, int]:
+    """solve both days - check if an ingredient id is
+    in any of the ranges. If so - break and count.
+
+    Then apply solve_part2.
+
+    Args:
+        data (Any): Puzzle data.
+
+    Returns:
+        tuple[int, int]: part 1 value, part 2 value.
+    """
     ranges, ingredient_ids = parse_input(data)
-    valid_id = 0
-    for x in ingredient_ids:
-        for y in ranges:
-            if x in y:
-                valid_id += 1
-                break
-    return valid_id
+    valid_id: int = 0
+    for ingredient in ingredient_ids:
+        # THE OLD WAY I DID IT.
+        #     for y in ranges:
+        #         if x in y:
+        #             valid_id += 1
+        #             break
+        if any(ingredient in r for r in ranges):
+            valid_id += 1
+    return valid_id, solve_part2(ranges)
 
 
 @report_results
 def solveday(data: Any) -> AoCResult:
-    p1: int = solve_part1(data)
-    p2: int = 0
+    p1, p2 = solve_day05(data)
     return p1, p2
 
 
-expected_test_results: AoCResult = (3, 0)
+expected_test_results: AoCResult = (3, 14)
 
 
 def tests(test_input: Any) -> None: