Maze Solver SbSp: Final cleanup

Author: bzaczynski

python-maze-solver/source_code_final/requirements.txt

@@ -1,17 +1 @@
-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/graphs/converter.py

@@ -43,6 +43,10 @@ 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:
@@ -81,7 +85,3 @@ 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_step_4/src/maze_solver/models/maze.py

@@ -12,19 +12,16 @@
 class Maze:
     squares: tuple[Square, ...]
 
+    @classmethod
+    def load(cls, path: Path) -> "Maze":
+        return Maze(tuple(load_squares(path)))
+
     def __post_init__(self) -> None:
         validate_indices(self)
         validate_rows_columns(self)
         validate_entrance(self)
         validate_exit(self)
 
-    @classmethod
-    def load(cls, path: Path) -> "Maze":
-        return Maze(tuple(load_squares(path)))
-
-    def dump(self, path: Path) -> None:
-        dump_squares(self.width, self.height, self.squares, path)
-
     def __iter__(self) -> Iterator[Square]:
         return iter(self.squares)
 
@@ -47,6 +44,9 @@ def entrance(self) -> Square:
     def exit(self) -> Square:
         return next(sq for sq in self if sq.role is Role.EXIT)
 
+    def dump(self, path: Path) -> None:
+        dump_squares(self.width, self.height, self.squares, path)
+
 
 def validate_indices(maze: Maze) -> None:
     assert [square.index for square in maze] == list(