Merge pull request #197 from nikobockerman/changes

Small improvements

Author: nikobockerman

adventofcode/y2023/d1.py

@@ -1,6 +1,8 @@
 import logging
 from collections.abc import Iterable
 
+_logger = logging.getLogger(__name__)
+
 _STR_DIGITS = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine"]
 
 
@@ -35,9 +37,9 @@ def _int_chars_to_int(s1: str, s2: str) -> int:
 
 def _p1_ints(lines: Iterable[str], *, use_texts: bool) -> Iterable[int]:
     for line in lines:
-        logging.debug("line=%s", line)
+        _logger.debug("line=%s", line)
         value = _int_chars_to_int(*_find_first_and_last_int(line, use_texts=use_texts))
-        logging.debug("value=%s", value)
+        _logger.debug("value=%s", value)
         yield value
 
 

adventofcode/y2023/d12.py

@@ -5,6 +5,8 @@
 
 from attrs import frozen
 
+_logger = logging.getLogger(__name__)
+
 
 @frozen
 class _Data:
@@ -192,12 +194,12 @@ def _calculate_alternatives(
     classifier = _Classifier(data, prev_state)
     if classifier.completion() is True:
         result = 1
-        logging.debug("CA %02d: %s -> Impossible -> %d", recursion_depth, data, result)
+        _logger.debug("CA %02d: %s -> Impossible -> %d", recursion_depth, data, result)
         return result
 
     if classifier.completion() is False:
         result = 0
-        logging.debug("CA %02d: %s -> Impossible -> %d", recursion_depth, data, result)
+        _logger.debug("CA %02d: %s -> Impossible -> %d", recursion_depth, data, result)
         return result
 
     first_unknown_index = classifier.first_unknown_index()
@@ -241,14 +243,14 @@ def _calculate_alternatives(
             result_cache[cache_key] = alternative_result
         result += alternative_result
 
-    logging.debug("CA %02d: %s -> Guessed    -> %d", recursion_depth, data, result)
+    _logger.debug("CA %02d: %s -> Guessed    -> %d", recursion_depth, data, result)
     return result
 
 
 def p1(input_str: str) -> int:
     def p1_calc(ind: int, input_data: _Data) -> int:
         res = _calculate_alternatives(input_data)
-        logging.info("%d: %s -> %s", ind, input_data, res)
+        _logger.info("%d: %s -> %s", ind, input_data, res)
         return res
 
     return sum(
@@ -266,7 +268,7 @@ def input_line_data_mapper(input_line_data: _Data) -> _Data:
 
     def p2_calc(ind: int, input_data: _Data) -> int:
         res = _calculate_alternatives(input_data)
-        logging.info("%d: %s -> %s", ind, input_data, res)
+        _logger.info("%d: %s -> %s", ind, input_data, res)
         return res
 
     return sum(

adventofcode/y2023/d13.py

@@ -5,6 +5,8 @@
 from adventofcode.tooling.coordinates import X, Y
 from adventofcode.tooling.map import IterDirection, Map2d
 
+_logger = logging.getLogger(__name__)
+
 
 def _parse_maps(input_str: str) -> Iterable[Map2d]:
     lines: list[list[str]] = []
@@ -93,7 +95,7 @@ def _check_if_datas_around_reflection_match(
             allowed_mismatches,
         )
         if match_res is None:
-            logging.debug("Invalid mirror data at %d and %d", i1, i2)
+            _logger.debug("Invalid mirror data at %d and %d", i1, i2)
             return None
 
         assert match_res >= 0
@@ -107,7 +109,7 @@ def _check_if_datas_around_reflection_match(
 def _find_reflection_line(
     map_: Map2d, direction: IterDirection, required_mismatches: int = 0
 ) -> int | None:
-    logging.debug(
+    _logger.debug(
         "Searching for reflection with %d required mismatches", required_mismatches
     )
     search_start_pos = 0
@@ -117,7 +119,7 @@ def _find_reflection_line(
             map_, search_start_pos, direction, remaining_mismatches
         )
         if found_data_info is None:
-            logging.debug(
+            _logger.debug(
                 "No consecutive datas found with %d allowed mismatches",
                 remaining_mismatches,
             )
@@ -127,7 +129,7 @@ def _find_reflection_line(
         search_start_pos = first_pos + 1
         remaining_mismatches -= mismatches
 
-        logging.debug(
+        _logger.debug(
             "Found reflection at %d with %d mismatches remaining",
             first_pos,
             remaining_mismatches,
@@ -137,7 +139,7 @@ def _find_reflection_line(
             map_, first_pos, direction, remaining_mismatches
         )
         if check_res is None:
-            logging.debug(
+            _logger.debug(
                 "Datas around reflection don't match with %d allowed mismatches",
                 remaining_mismatches,
             )
@@ -146,16 +148,16 @@ def _find_reflection_line(
         remaining_mismatches -= check_res
         assert remaining_mismatches >= 0
         if remaining_mismatches > 0:
-            logging.debug("Not enough mismatches")
+            _logger.debug("Not enough mismatches")
             continue
-        logging.debug("Found perfect reflection at %d", first_pos)
+        _logger.debug("Found perfect reflection at %d", first_pos)
         return first_pos
 
 
 def _resolve(input_str: str, required_mismatches_per_map: int) -> int:
     result: int = 0
     for map_counter, map_ in enumerate(_parse_maps(input_str), 1):
-        logging.info(
+        _logger.info(
             "Map %2d: Size (LxC) %2d x %2d\n%s",
             map_counter,
             map_.height,
@@ -178,7 +180,7 @@ def _resolve(input_str: str, required_mismatches_per_map: int) -> int:
 
         map_result = (match_index + 1) * match_multiplier
         result += map_result
-        logging.info(
+        _logger.info(
             "Map %2d: %s: %2d, map_result: %5d, result so far: %d",
             map_counter,
             line_or_column,

adventofcode/y2023/d16.py

@@ -140,17 +140,17 @@ def p2(input_str: str) -> int:
         for y1 in (map_.tl_y, map_.br_y):
             coord = Coord2d(y1, X(x1))
             dir_ = Dir.S if y1 == 0 else Dir.N
-            logging.info("Trying %s -> %s", coord, dir_)
+            _logger.info("Trying %s -> %s", coord, dir_)
             result = _try_one_enter(coord, dir_, map_, exit_cache)
-            logging.info("Result %s -> %s = %d", coord, dir_, result)
+            _logger.info("Result %s -> %s = %d", coord, dir_, result)
             results.append((coord, dir_, result))
     for y2 in range(map_.tl_y, map_.br_y + 1):
         for x2 in (map_.tl_x, map_.br_x):
             coord = Coord2d(Y(y2), x2)
             dir_ = Dir.E if x2 == 0 else Dir.W
-            logging.info("Trying %s -> %s", coord, dir_)
+            _logger.info("Trying %s -> %s", coord, dir_)
             result = _try_one_enter(coord, dir_, map_, exit_cache)
-            logging.info("Result %s -> %s = %d", coord, dir_, result)
+            _logger.info("Result %s -> %s = %d", coord, dir_, result)
             results.append((coord, dir_, result))
 
     results.sort(key=lambda r: r[2])

adventofcode/y2023/d19.py

@@ -291,9 +291,7 @@ def _possible_category_value_ranges(
 
 def _construct_workflow_steps(workflow: _Workflow) -> list[_WorkflowStep]:
     result = list[_WorkflowStep]()
-    failure_limits: dict[_Category, list[range] | None] = {
-        cat: None for cat in _categories
-    }
+    failure_limits: dict[_Category, list[range] | None] = dict.fromkeys(_categories)
     for rule in workflow.rules:
         category_value_ranges = _category_value_ranges_from_rule(rule)
         applicable_category_value_ranges = _merge_category_value_ranges(
@@ -334,7 +332,7 @@ def p2(input_str: str) -> int:
             assert all(
                 ranges is not None for ranges in step.category_value_ranges.values()
             )
-            ranges = cast(dict[_Category, list[range]], step.category_value_ranges)
+            ranges = cast("dict[_Category, list[range]]", step.category_value_ranges)
             accepted_category_value_ranges.append(ranges)
             continue
 

adventofcode/y2023/d2.py

@@ -1,11 +1,13 @@
 import logging
 from collections.abc import Iterable
 
+_logger = logging.getLogger(__name__)
+
 
 def _parse_input(lines: Iterable[str]) -> Iterable[tuple[int, list[dict[str, int]]]]:
     for line in lines:
         g_id, rounds = line[5:].split(":")
-        logging.debug("line=%s", line)
+        _logger.debug("line=%s", line)
 
         yield (
             int(g_id),

adventofcode/y2023/d20.py

@@ -157,7 +157,7 @@ def process_pulse(self, pulse: _Pulse) -> Iterator[_PulseNew]:
         yield from self._get_output_pulses(output_pulse_value)
 
     def set_inputs(self, inputs: Iterable[_ModuleName]) -> None:
-        self._state.update({name: _PulseLow for name in inputs})
+        self._state.update(dict.fromkeys(inputs, _PulseLow))
 
 
 class _GatewayConjuction(_Conjunction):

adventofcode/y2023/d3.py

@@ -3,6 +3,8 @@
 
 from attrs import Factory, define, field
 
+_logger = logging.getLogger(__name__)
+
 
 @define
 class _InputNumber:
@@ -25,7 +27,7 @@ class _InputRow:
 def _parse_input(lines: Iterable[str]) -> list[_InputRow]:
     rows: list[_InputRow] = []
     for row_ind, line in enumerate(lines):
-        logging.debug("%s: line=%s", row_ind, line)
+        _logger.debug("%s: line=%s", row_ind, line)
         row = _InputRow()
 
         number: str | None = None
@@ -50,7 +52,7 @@ def _parse_input(lines: Iterable[str]) -> list[_InputRow]:
             row.numbers.append(_InputNumber(number, len(line) - 1 - len(number)))
             number = None
 
-        logging.debug("%s: row=%s", row_ind, row)
+        _logger.debug("%s: row=%s", row_ind, row)
         rows.append(row)
     return rows
 
@@ -90,10 +92,10 @@ def is_adjacent(number: Number) -> bool:
                 min(len(d), row_ind + 2),
             )
             if is_adjacent(number):
-                logging.debug("input_number=%s. Adjacent", input_number)
+                _logger.debug("input_number=%s. Adjacent", input_number)
                 result += number.number
             else:
-                logging.debug("input_number=%s. NOT adjacent", input_number)
+                _logger.debug("input_number=%s. NOT adjacent", input_number)
 
     return result
 

adventofcode/y2023/d4.py

@@ -42,10 +42,9 @@ def p2(input_str: str) -> int:
         matches = len(set(cards.winning) & set(cards.own))
         card_count = counts[cards.card_id]
         counts.update(
-            {
-                i: card_count
-                for i in range(cards.card_id + 1, cards.card_id + 1 + matches)
-            }
+            dict.fromkeys(
+                range(cards.card_id + 1, cards.card_id + 1 + matches), card_count
+            )
         )
 
     return sum(v for v in counts.values())

adventofcode/y2023/d5.py

@@ -5,6 +5,8 @@
 
 from adventofcode.tooling.ranges import are_ranges_overlapping, partition_range
 
+_logger = logging.getLogger(__name__)
+
 
 @define
 class _RangeMap:
@@ -111,8 +113,8 @@ def get_destination(mappings: list[_RangeMap], source: int) -> int:
 
 def p1(input_str: str) -> int:
     seeds, maps = _parse_input(input_str.splitlines())
-    logging.debug("seeds=%s", seeds)
-    logging.debug("maps=%s", maps)
+    _logger.debug("seeds=%s", seeds)
+    _logger.debug("maps=%s", maps)
 
     return min(_get_location(maps, seed) for seed in seeds)
 

adventofcode/y2023/d8.py

@@ -5,6 +5,8 @@
 
 from attrs import define
 
+_logger = logging.getLogger(__name__)
+
 
 def _parse_input(lines: list[str]) -> tuple[str, list[tuple[str, tuple[str, str]]]]:
     directions = lines[0]
@@ -49,7 +51,7 @@ def _create_map_data(map_nodes_list: list[tuple[str, tuple[str, str]]]) -> _MapD
     locations_mapping = {
         location: index for index, (location, _) in enumerate(map_nodes_list)
     }
-    logging.debug("locations_mapping=%s", locations_mapping)
+    _logger.debug("locations_mapping=%s", locations_mapping)
 
     def get_start_locations() -> Iterable[int]:
         for location, _ in map_nodes_list:
@@ -141,17 +143,17 @@ def _resolve_loop_length(
 
 def p2(input_str: str) -> int:
     directions, map_nodes_list = _parse_input(input_str.splitlines())
-    logging.debug("directions=%s", directions)
-    logging.debug("map_nodes_list=%s", map_nodes_list)
+    _logger.debug("directions=%s", directions)
+    _logger.debug("map_nodes_list=%s", map_nodes_list)
 
     map_data = _create_map_data(map_nodes_list)
-    logging.debug("map_data=%s", map_data)
+    _logger.debug("map_data=%s", map_data)
 
     path_lengths = [
         _resolve_loop_length(start_location, directions, map_data)
         for start_location in map_data.start_locations
     ]
 
-    logging.info("path_lengths=%s", path_lengths)
+    _logger.info("path_lengths=%s", path_lengths)
 
     return math.lcm(*path_lengths)