Day 11 probably done

Signed-off-by: Rob Grant <rob.grant@nanoporetech.com>

day11/run.py

@@ -2,40 +2,41 @@
 import operator as op
 import re
 
-from inputs import REAL as data
+from inputs import REAL as DATA
 
 
 class Monkey:
-    inspection_counter = 0
+    inspection_count = 0
     monkey_parser = re.compile(
         r"""Monkey \d:
   Starting items: (?P<items>[\d, ]+)
-  Operation: new = old (?P<op>[\+-/\*]) (?P<op_target>\d+|old)
+  Operation: new = old (?P<op>[\+-/\*]) (?P<op_num>\d+|old)
   Test: divisible by (?P<test>\d+)
-    If true: throw to monkey (?P<test_pass>\d)
-    If false: throw to monkey (?P<test_fail>\d)"""
+    If true: throw to monkey (?P<passed>\d)
+    If false: throw to monkey (?P<failed>\d)"""
     )
     ops = {"+": op.add, "-": op.sub, "*": op.mul, "/": op.floordiv}
 
     def __init__(self, monkey_string):
         fields = self.monkey_parser.match(monkey_string).groupdict()
         self.items = list(map(int, fields["items"].split(", ")))
         self.op = self.ops[fields["op"]]
-        self.op_target = int(fields["op_target"]) if fields["op_target"] != "old" else None  # None means use "old"
-        self.test, self.test_pass, self.test_fail = map(int, [fields[f] for f in ("test", "test_pass", "test_fail")])
+        self.op_num = int(fields["op_num"]) if fields["op_num"] != "old" else None  # None means use "old"
+        self.test, self.passed, self.failed = map(int, [fields[f] for f in ("test", "passed", "failed")])
 
-    def turn(self, monkeys, worry_divisor, lcm_optimisation=1):
-        self.inspection_counter += len(self.items)
+    def turn(self, monkeys, worry_divisor, lcm_optimisation):
+        self.inspection_count += len(self.items)
         for item in self.items:
-            item = self.op(item, self.op_target if self.op_target is not None else item)  # worry operation
-            item = item // worry_divisor % lcm_optimisation  # boredom and lcm
-            monkeys[self.test_pass if item % self.test == 0 else self.test_fail].items.append(item)
+            item = self.op(item, item if self.op_num is None else self.op_num) // worry_divisor
+            if lcm_optimisation:
+                item %= lcm_optimisation
+            monkeys[self.failed if item % self.test else self.passed].items.append(item)
         self.items = []
 
 
-def simulate_monkeys(worry_divisor, round_count):
-    monkeys = {i: Monkey(m) for i, m in enumerate(data.split("\n\n"))}
-    lcm = 1 if worry_divisor > 1 else functools.reduce(op.mul, [m.test for m in monkeys.values()])
+def sim_monkeys(worry_divisor, round_count):
+    monkeys = {i: Monkey(m) for i, m in enumerate(DATA.split("\n\n"))}
+    lcm = None if worry_divisor > 1 else functools.reduce(op.mul, [m.test for m in monkeys.values()])
 
     for _ in range(round_count):
         for i in range(len(monkeys)):
@@ -44,5 +45,5 @@ def simulate_monkeys(worry_divisor, round_count):
     return monkeys.values()
 
 
-print(f"Part 1: {(counts := sorted(m.inspection_counter for m in  simulate_monkeys(3, 20)))[-1] * counts[-2]}")
-print(f"Part 2: {(counts := sorted(m.inspection_counter for m in simulate_monkeys(1, 10000)))[-1] * counts[-2]}")
+print(f"Part 1: {(counts := sorted(m.inspection_count for m in sim_monkeys(3, 20)))[-1] * counts[-2]}")
+print(f"Part 2: {(counts := sorted(m.inspection_count for m in sim_monkeys(1, 10000)))[-1] * counts[-2]}")