mjpieters
diff --git a/‎2023/Day 08.ipynb
Lines changed: 9 additions & 3 deletions b/‎2023/Day 08.ipynb
Lines changed: 9 additions & 3 deletions
diff --git a/‎2023/Day 10.ipynb
Lines changed: 6 additions & 4 deletions b/‎2023/Day 10.ipynb
Lines changed: 6 additions & 4 deletions
@@ -21,7 +21,7 @@
     "from dataclasses import dataclass\n",
     "from itertools import cycle\n",
     "\n",
-    "Step: t.TypeAlias = t.Literal[\"L\", \"R\"]\n",
+    "type Step = t.Literal[\"L\", \"R\"]\n",
     "\n",
     "\n",
     "class DesertNode(t.NamedTuple):\n",
@@ -127,10 +127,16 @@
    "source": [
     "from math import lcm\n",
     "\n",
+    "# help type checkers understand that the iterable passed to `all()` won't contain None\n",
+    "# values\n",
+    "_T = t.TypeVar(\"_T\")\n",
+    "_AllNotNone = t.Callable[[t.Iterable[_T | None]], t.TypeGuard[t.Iterable[_T]]]\n",
+    "_all_non_zero_int: _AllNotNone[t.Any] = t.cast(_AllNotNone[t.Any], all)\n",
+    "\n",
     "\n",
     "class GhostlyDesertMap(DesertMap):\n",
     "    @property\n",
-    "    def starting_points(self) -> tuple[DesertMap, ...]:\n",
+    "    def starting_points(self) -> tuple[DesertNode, ...]:\n",
     "        return tuple(node for node in self.nodes.values() if node.name[-1] == \"A\")\n",
     "\n",
     "    def from_as_to_zs(self, steps: t.Iterable[Step]) -> int:\n",
@@ -141,7 +147,7 @@
     "            for i, node in enumerate(nodes):\n",
     "                if not loops[i] and node.name[-1] == \"Z\":\n",
     "                    loops[i] = s\n",
-    "            if all(loops):\n",
+    "            if _all_non_zero_int(loops):\n",
     "                return lcm(*loops)\n",
     "\n",
     "        raise AssertionError(\"Goal never reached\")\n",
 
@@ -27,10 +27,10 @@
     "from enum import Enum\n",
     "from itertools import count\n",
     "\n",
-    "PipeChar: t.TypeAlias = t.Literal[\"S\", \"|\", \"-\", \"L\", \"J\", \"7\", \"F\"]\n",
-    "MapChar: t.TypeAlias = t.Literal[\".\"] | PipeChar\n",
-    "Connections: t.TypeAlias = tuple[()] | tuple[PipeChar, PipeChar, PipeChar]\n",
-    "PosAndChar: t.TypeAlias = tuple[complex, MapChar]\n",
+    "type PipeChar = t.Literal[\"S\", \"|\", \"-\", \"L\", \"J\", \"7\", \"F\"]\n",
+    "type MapChar = t.Literal[\".\"] | PipeChar\n",
+    "type Connections = tuple[()] | tuple[PipeChar, PipeChar, PipeChar]\n",
+    "type PosAndChar = tuple[complex, MapChar]\n",
     "_impassible = ()\n",
     "_n_conn = (\"|\", \"7\", \"F\", \"S\")\n",
     "_s_conn = (\"|\", \"L\", \"J\", \"S\")\n",
@@ -52,6 +52,8 @@
     "        connected_to: tuple[Connections, Connections, Connections, Connections]\n",
     "\n",
     "    else:\n",
+    "        # hide the extended new method from pyright, it'll otherwise\n",
+    "        # be confused about PipePiece(...) calls later on.\n",
     "\n",
     "        def __new__(\n",
     "            cls,\n",