Maze Solver SbSp: TR Feedback (Materials)

Author: bzaczynski

python-maze-solver/source_code_final/pyproject.toml

@@ -7,7 +7,7 @@ name = "maze-solver"
 version = "1.0.0"
 
 dependencies = [
-    "networkx == 3.0",
+    "networkx >= 3.0",
 ]
 
 [project.scripts]

python-maze-solver/source_code_final/requirements.txt

@@ -0,0 +1,17 @@
+blessed==1.20.0
+bpython==0.24
+certifi==2022.12.7
+charset-normalizer==3.0.1
+curtsies==0.4.1
+cwcwidth==0.1.8
+greenlet==2.0.2
+idna==3.4
+# Editable install with no version control (maze-solver==1.0.0)
+-e /home/bartek/Desktop/maze-solver-final
+networkx==3.0
+Pygments==2.14.0
+pyxdg==0.28
+requests==2.28.2
+six==1.16.0
+urllib3==1.26.14
+wcwidth==0.2.6

python-maze-solver/source_code_final/src/maze_solver/__main__.py

@@ -7,8 +7,9 @@
 
 
 def main() -> None:
+    maze = Maze.load(parse_path())
     renderer = SVGRenderer()
-    for solution in solve_all(maze := Maze.load(parse_path())):
+    for solution in solve_all(maze):
         renderer.render(maze, solution).preview()
     else:
         print("No solution found")

python-maze-solver/source_code_final/src/maze_solver/graphs/converter.py

@@ -1,3 +1,4 @@
+import math
 from typing import NamedTuple, TypeAlias
 
 import networkx as nx
@@ -19,14 +20,13 @@ def flip(self) -> "Edge":
         return Edge(self.node2, self.node1)
 
     @property
-    def distance(self) -> int:
-        if self.node1.row == self.node2.row:
-            return abs(self.node1.column - self.node2.column)
-        if self.node1.column == self.node2.column:
-            return abs(self.node1.row - self.node2.row)
-        raise ValueError("Can only move horizontally oor vertically")
-
-    def weight(self, bonus=1, penalty=2) -> int:
+    def distance(self) -> float:
+        return math.dist(
+            (self.node1.row, self.node1.column),
+            (self.node2.row, self.node2.column),
+        )
+
+    def weight(self, bonus=1, penalty=2) -> float:
         match self.node2.role:
             case Role.REWARD:
                 return self.distance - bonus
@@ -43,10 +43,6 @@ def make_graph(maze: Maze) -> nx.DiGraph:
     )
 
 
-def get_directed_edges(maze: Maze, nodes: set[Node]) -> set[Edge]:
-    return (edges := get_edges(maze, nodes)) | {edge.flip for edge in edges}
-
-
 def get_nodes(maze: Maze) -> set[Node]:
     nodes: set[Node] = set()
     for square in maze:
@@ -66,7 +62,7 @@ def get_nodes(maze: Maze) -> set[Node]:
 def get_edges(maze: Maze, nodes: set[Node]) -> set[Edge]:
     edges: set[Edge] = set()
     for source_node in nodes:
-        # Follow east:
+        # Follow right:
         node = source_node
         for x in range(node.column + 1, maze.width):
             if node.border & Border.RIGHT:
@@ -75,8 +71,7 @@ def get_edges(maze: Maze, nodes: set[Node]) -> set[Edge]:
             if node in nodes:
                 edges.add(Edge(source_node, node))
                 break
-
-        # Follow south:
+        # Follow down:
         node = source_node
         for y in range(node.row + 1, maze.height):
             if node.border & Border.BOTTOM:
@@ -86,3 +81,7 @@ def get_edges(maze: Maze, nodes: set[Node]) -> set[Edge]:
                 edges.add(Edge(source_node, node))
                 break
     return edges
+
+
+def get_directed_edges(maze: Maze, nodes: set[Node]) -> set[Edge]:
+    return (edges := get_edges(maze, nodes)) | {edge.flip for edge in edges}

python-maze-solver/source_code_final/src/maze_solver/models/solution.py

@@ -26,8 +26,7 @@ def __len__(self) -> int:
 
 
 def validate_collinear(current: Square, following: Square) -> Square:
-    assert 0 == min(
-        abs(current.row - following.row),
-        abs(current.column - following.column),
+    assert any(
+        [current.row == following.row, current.column == following.column]
     ), "Squares must be collinear"
     return following

python-maze-solver/source_code_final/src/maze_solver/persistence/serializer.py

@@ -16,8 +16,8 @@ def dump_squares(
     squares: tuple[Square, ...],
     path: pathlib.Path,
 ) -> None:
+    header, body = serialize(width, height, squares)
     with path.open(mode="wb") as file:
-        header, body = serialize(width, height, squares)
         header.write(file)
         body.write(file)
 

python-maze-solver/source_code_final/src/maze_solver/view/primitives.py

@@ -60,20 +60,11 @@ class Rect:
     top_left: Point | None = None
 
     def draw(self, **attributes) -> str:
-        return tag(
-            "rect",
-            **(
-                attributes
-                | (
-                    {
-                        "x": self.top_left.x,
-                        "y": self.top_left.y,
-                    }
-                    if self.top_left
-                    else {}
-                )
-            ),
-        )
+        if self.top_left:
+            attrs = attributes | {"x": self.top_left.x, "y": self.top_left.y}
+        else:
+            attrs = attributes
+        return tag("rect", **attrs)
 
 
 @dataclass(frozen=True)

python-maze-solver/source_code_final/src/maze_solver/view/renderer.py

@@ -57,9 +57,9 @@ def offset(self):
         return self.line_width // 2
 
     def render(self, maze: Maze, solution: Solution | None = None) -> SVG:
-        margin = 2 * (self.offset + self.line_width)
-        width = margin + maze.width * self.square_size
-        height = margin + maze.height * self.square_size
+        margins = 2 * (self.offset + self.line_width)
+        width = margins + maze.width * self.square_size
+        height = margins + maze.height * self.square_size
         return SVG(
             tag(
                 "svg",