mirror of
https://github.com/maoakeEnterprise/amazing.git
synced 2026-04-28 16:04:35 +02:00
Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 21e9aba95f | |||
| 9fa121cdce | |||
| 04c28a851f | |||
| 6189d7f321 | |||
| e63c2679a6 | |||
| f04381568d | |||
| ee4f48a5c0 | |||
| 2532a35e30 | |||
| 6f503bdd36 | |||
| 5022cfe020 | |||
| 11947db62f | |||
| 0045def73b |
@@ -215,5 +215,3 @@ __marimo__/
|
|||||||
# Streamlit
|
# Streamlit
|
||||||
.streamlit/secrets.toml
|
.streamlit/secrets.toml
|
||||||
test.txt
|
test.txt
|
||||||
|
|
||||||
mazegen-1.0.0-py3-none-any.whl
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ clean:
|
|||||||
fclean: clean
|
fclean: clean
|
||||||
rm mazegen-1.0.0-py3-none-any.whl
|
rm mazegen-1.0.0-py3-none-any.whl
|
||||||
|
|
||||||
lint:
|
lint: install
|
||||||
uv run flake8 . --exclude=.venv
|
uv run flake8 . --exclude=.venv
|
||||||
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs -p mazegen
|
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs -p mazegen
|
||||||
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs -p parsing
|
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs -p parsing
|
||||||
@@ -29,7 +29,7 @@ lint:
|
|||||||
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs tests
|
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs tests
|
||||||
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs a_maze_ing.py
|
uv run env PYTHONPATH=src python3 -m mypy --warn-return-any --warn-unused-ignores --ignore-missing-imports --disallow-untyped-defs --check-untyped-defs a_maze_ing.py
|
||||||
|
|
||||||
lint-strict:
|
lint-strict: install
|
||||||
uv run flake8 . --exclude=.venv
|
uv run flake8 . --exclude=.venv
|
||||||
uv run env PYTHONPATH=src python3 -m mypy --strict -p mazegen
|
uv run env PYTHONPATH=src python3 -m mypy --strict -p mazegen
|
||||||
uv run env PYTHONPATH=src python3 -m mypy --strict src/AMazeIng.py
|
uv run env PYTHONPATH=src python3 -m mypy --strict src/AMazeIng.py
|
||||||
|
|||||||
+2
-4
@@ -224,7 +224,6 @@ class MazeMLX:
|
|||||||
progressively.
|
progressively.
|
||||||
"""
|
"""
|
||||||
path = amazing.solve_path()
|
path = amazing.solve_path()
|
||||||
print(path)
|
|
||||||
actual = amazing.entry
|
actual = amazing.entry
|
||||||
actual = (actual[0] - 1, actual[1] - 1)
|
actual = (actual[0] - 1, actual[1] - 1)
|
||||||
maze = amazing.maze.get_maze()
|
maze = amazing.maze.get_maze()
|
||||||
@@ -483,12 +482,11 @@ def main() -> None:
|
|||||||
"""Run the maze application."""
|
"""Run the maze application."""
|
||||||
mlx = None
|
mlx = None
|
||||||
try:
|
try:
|
||||||
mlx = MazeMLX(1000, 1000)
|
mlx = MazeMLX(1600, 2000)
|
||||||
config = Parsing.get_data_maze("config.txt")
|
config = Parsing.get_data_maze("config.txt")
|
||||||
amazing = AMazeIng(**config)
|
amazing = AMazeIng(**config)
|
||||||
mlx.start(amazing)
|
mlx.start(amazing)
|
||||||
with open("test.txt", "w") as output:
|
amazing.export_maze()
|
||||||
output.write(amazing.__str__())
|
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
print(err)
|
print(err)
|
||||||
finally:
|
finally:
|
||||||
|
|||||||
+6
-15
@@ -1,17 +1,8 @@
|
|||||||
WIDTH=10
|
WIDTH=4
|
||||||
HEIGHT=10
|
HEIGHT=4
|
||||||
ENTRY=1,1
|
ENTRY=1,1
|
||||||
EXIT=10,10
|
EXIT=1,2
|
||||||
OUTPUT_FILE=con
|
OUTPUT_FILE=con.txt
|
||||||
PERFECT=True
|
PERFECT=False
|
||||||
GENERATOR=DFS
|
GENERATOR=Kruskal
|
||||||
SOLVER=AStar
|
SOLVER=AStar
|
||||||
salut
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
#
|
|
||||||
##
|
|
||||||
|
|||||||
Binary file not shown.
+13
-3
@@ -12,8 +12,8 @@ class AMazeIng(BaseModel):
|
|||||||
|
|
||||||
model_config = ConfigDict(arbitrary_types_allowed=True)
|
model_config = ConfigDict(arbitrary_types_allowed=True)
|
||||||
|
|
||||||
width: int = Field(ge=4)
|
width: int = Field(ge=4, le=100)
|
||||||
height: int = Field(ge=4)
|
height: int = Field(ge=4, le=100)
|
||||||
entry: tuple[int, int]
|
entry: tuple[int, int]
|
||||||
exit: tuple[int, int]
|
exit: tuple[int, int]
|
||||||
output_file: str = Field(min_length=3)
|
output_file: str = Field(min_length=3)
|
||||||
@@ -21,6 +21,7 @@ class AMazeIng(BaseModel):
|
|||||||
maze: Maze = Field(default=Maze(None))
|
maze: Maze = Field(default=Maze(None))
|
||||||
generator: MazeGenerator
|
generator: MazeGenerator
|
||||||
solver: MazeSolver
|
solver: MazeSolver
|
||||||
|
seed: int | None = Field(default=None)
|
||||||
|
|
||||||
@model_validator(mode="after")
|
@model_validator(mode="after")
|
||||||
def check_entry_exit(self) -> Self:
|
def check_entry_exit(self) -> Self:
|
||||||
@@ -38,6 +39,8 @@ class AMazeIng(BaseModel):
|
|||||||
raise ValueError("Exit coordinates exceed the maze size")
|
raise ValueError("Exit coordinates exceed the maze size")
|
||||||
if self.entry == self.exit:
|
if self.entry == self.exit:
|
||||||
raise ValueError("Entry and Exit coordinates cant be the same")
|
raise ValueError("Entry and Exit coordinates cant be the same")
|
||||||
|
if self.width <= 10 or self.height <= 10:
|
||||||
|
print("Height or width to low for disply forty two logo")
|
||||||
return self
|
return self
|
||||||
|
|
||||||
def generate(self) -> Generator[Maze, None, None]:
|
def generate(self) -> Generator[Maze, None, None]:
|
||||||
@@ -48,7 +51,9 @@ class AMazeIng(BaseModel):
|
|||||||
Yields:
|
Yields:
|
||||||
The current maze state after each generation step.
|
The current maze state after each generation step.
|
||||||
"""
|
"""
|
||||||
for array in self.generator.generator(self.height, self.width):
|
for array in self.generator.generator(
|
||||||
|
self.height, self.width, self.seed
|
||||||
|
):
|
||||||
self.maze.set_maze(array)
|
self.maze.set_maze(array)
|
||||||
yield self.maze
|
yield self.maze
|
||||||
return
|
return
|
||||||
@@ -61,6 +66,11 @@ class AMazeIng(BaseModel):
|
|||||||
"""
|
"""
|
||||||
return self.solver.solve(self.maze, self.height, self.width)
|
return self.solver.solve(self.maze, self.height, self.width)
|
||||||
|
|
||||||
|
def export_maze(self) -> None:
|
||||||
|
"""Export maze, entry, exit and resolved path in output_file"""
|
||||||
|
with open(self.output_file, "w") as file:
|
||||||
|
file.write(self.__str__())
|
||||||
|
|
||||||
def __str__(self) -> str:
|
def __str__(self) -> str:
|
||||||
"""Return a string representation of the maze and its solution.
|
"""Return a string representation of the maze and its solution.
|
||||||
|
|
||||||
|
|||||||
@@ -20,8 +20,8 @@ class MazeGenerator(ABC):
|
|||||||
end: Ending cell coordinates, using 1-based indexing.
|
end: Ending cell coordinates, using 1-based indexing.
|
||||||
perfect: Whether to generate a perfect maze with no loops.
|
perfect: Whether to generate a perfect maze with no loops.
|
||||||
"""
|
"""
|
||||||
self.start = (start[0] - 1, start[1] - 1)
|
self.start = (start[1] - 1, start[0] - 1)
|
||||||
self.end = (end[0] - 1, end[1] - 1)
|
self.end = (end[1] - 1, end[0] - 1)
|
||||||
self.perfect = perfect
|
self.perfect = perfect
|
||||||
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
@@ -295,6 +295,10 @@ class Kruskal(MazeGenerator):
|
|||||||
if height > 10 and width > 10:
|
if height > 10 and width > 10:
|
||||||
cells_ft = self.get_cell_ft(width, height)
|
cells_ft = self.get_cell_ft(width, height)
|
||||||
if cells_ft and (self.start in cells_ft or self.end in cells_ft):
|
if cells_ft and (self.start in cells_ft or self.end in cells_ft):
|
||||||
|
print(
|
||||||
|
"Forty two will not be display. "
|
||||||
|
"Entry or exit set in the ft logo"
|
||||||
|
)
|
||||||
cells_ft = None
|
cells_ft = None
|
||||||
|
|
||||||
if seed is not None:
|
if seed is not None:
|
||||||
@@ -324,7 +328,6 @@ class Kruskal(MazeGenerator):
|
|||||||
len(sets.sets) == 19 and cells_ft is not None
|
len(sets.sets) == 19 and cells_ft is not None
|
||||||
):
|
):
|
||||||
break
|
break
|
||||||
print(f"nb sets: {len(sets.sets)}")
|
|
||||||
maze = self.walls_to_maze(walls, height, width)
|
maze = self.walls_to_maze(walls, height, width)
|
||||||
if self.perfect is False:
|
if self.perfect is False:
|
||||||
gen = Kruskal.unperfect_maze(width, height, maze, cells_ft)
|
gen = Kruskal.unperfect_maze(width, height, maze, cells_ft)
|
||||||
@@ -347,8 +350,8 @@ class DepthFirstSearch(MazeGenerator):
|
|||||||
end: Ending cell coordinates, using 1-based indexing.
|
end: Ending cell coordinates, using 1-based indexing.
|
||||||
perfect: Whether to generate a perfect maze with no loops.
|
perfect: Whether to generate a perfect maze with no loops.
|
||||||
"""
|
"""
|
||||||
self.start = (start[0] - 1, start[1] - 1)
|
self.start = (start[1] - 1, start[0] - 1)
|
||||||
self.end = (end[0] - 1, end[1] - 1)
|
self.end = (end[1] - 1, end[0] - 1)
|
||||||
self.perfect = perfect
|
self.perfect = perfect
|
||||||
self.forty_two: set[tuple[int, int]] | None = None
|
self.forty_two: set[tuple[int, int]] | None = None
|
||||||
|
|
||||||
@@ -369,7 +372,7 @@ class DepthFirstSearch(MazeGenerator):
|
|||||||
The final generated maze.
|
The final generated maze.
|
||||||
"""
|
"""
|
||||||
if seed is not None:
|
if seed is not None:
|
||||||
np.random.seed(seed)
|
random.seed(seed)
|
||||||
maze = self.init_maze(width, height)
|
maze = self.init_maze(width, height)
|
||||||
if width > 10 and height > 10:
|
if width > 10 and height > 10:
|
||||||
self.forty_two = self.get_cell_ft(width, height)
|
self.forty_two = self.get_cell_ft(width, height)
|
||||||
@@ -380,6 +383,11 @@ class DepthFirstSearch(MazeGenerator):
|
|||||||
and self.end not in self.forty_two
|
and self.end not in self.forty_two
|
||||||
):
|
):
|
||||||
visited = self.lock_cell_ft(visited, self.forty_two)
|
visited = self.lock_cell_ft(visited, self.forty_two)
|
||||||
|
else:
|
||||||
|
print(
|
||||||
|
"Forty two will not be display. "
|
||||||
|
"Entry or exit set in the ft logo"
|
||||||
|
)
|
||||||
path: list[tuple[int, int]] = list()
|
path: list[tuple[int, int]] = list()
|
||||||
w_h = (width, height)
|
w_h = (width, height)
|
||||||
coord = (0, 0)
|
coord = (0, 0)
|
||||||
|
|||||||
@@ -84,7 +84,8 @@ class AStar(MazeSolver):
|
|||||||
start: Start coordinates using 1-based indexing.
|
start: Start coordinates using 1-based indexing.
|
||||||
end: End coordinates using 1-based indexing.
|
end: End coordinates using 1-based indexing.
|
||||||
"""
|
"""
|
||||||
super().__init__(start, end)
|
self.start = (start[0] - 1, start[1] - 1)
|
||||||
|
self.end = (end[0] - 1, end[1] - 1)
|
||||||
|
|
||||||
def h(self, n: tuple[int, int]) -> int:
|
def h(self, n: tuple[int, int]) -> int:
|
||||||
"""Compute the Manhattan distance heuristic to the goal.
|
"""Compute the Manhattan distance heuristic to the goal.
|
||||||
@@ -196,6 +197,8 @@ class AStar(MazeSolver):
|
|||||||
to_check,
|
to_check,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
if path == self.end:
|
||||||
|
break
|
||||||
raise Exception("Path not found")
|
raise Exception("Path not found")
|
||||||
|
|
||||||
def get_rev_dir(self, current: Node) -> str:
|
def get_rev_dir(self, current: Node) -> str:
|
||||||
|
|||||||
+25
-8
@@ -62,14 +62,12 @@ class DataMaze:
|
|||||||
"GENERATOR",
|
"GENERATOR",
|
||||||
"SOLVER",
|
"SOLVER",
|
||||||
}
|
}
|
||||||
set_key = {key for key in data.keys()}
|
i = 0
|
||||||
if len(set_key) != len(key_test):
|
for key in data:
|
||||||
raise KeyError("Missing some data the len do not correspond")
|
if key in key_test:
|
||||||
res_key = {key for key in set_key if key not in key_test}
|
i += 1
|
||||||
if len(res_key) != 0:
|
if len(key_test) != i:
|
||||||
raise KeyError(
|
raise Exception("Some mandatory key not provide")
|
||||||
"Some Key " f"do not correspond the keys: {res_key}"
|
|
||||||
)
|
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def convert_values(data: dict[str, str]) -> dict[str, Any]:
|
def convert_values(data: dict[str, str]) -> dict[str, Any]:
|
||||||
@@ -88,6 +86,10 @@ class DataMaze:
|
|||||||
res: dict[str, Any] = {}
|
res: dict[str, Any] = {}
|
||||||
for key in key_int:
|
for key in key_int:
|
||||||
res.update({key: int(data[key])})
|
res.update({key: int(data[key])})
|
||||||
|
try:
|
||||||
|
res.update({"SEED": int(data["SEED"])})
|
||||||
|
except KeyError:
|
||||||
|
pass
|
||||||
for key in key_tuple:
|
for key in key_tuple:
|
||||||
res.update({key: DataMaze.convert_tuple(data[key])})
|
res.update({key: DataMaze.convert_tuple(data[key])})
|
||||||
for key in key_bool:
|
for key in key_bool:
|
||||||
@@ -181,6 +183,20 @@ class DataMaze:
|
|||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def test_file_format(file: str) -> None:
|
||||||
|
with open(file) as data_str:
|
||||||
|
for line in data_str:
|
||||||
|
if len(line.split("=", 1)) != 2:
|
||||||
|
raise Exception(
|
||||||
|
"config file format not respected. excpected format : "
|
||||||
|
"KEY=VALUE"
|
||||||
|
)
|
||||||
|
if not line.split("=", 1)[1] or line.split("=", 1)[1] == "\n":
|
||||||
|
raise Exception(
|
||||||
|
f"VALUE not provide for {line.split('=')[0]} key"
|
||||||
|
)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def get_data_maze(name_file: str) -> dict[str, Any]:
|
def get_data_maze(name_file: str) -> dict[str, Any]:
|
||||||
"""Load, validate, and convert maze configuration data from a file.
|
"""Load, validate, and convert maze configuration data from a file.
|
||||||
@@ -192,6 +208,7 @@ class DataMaze:
|
|||||||
A dictionary of validated configuration values with lowercase keys.
|
A dictionary of validated configuration values with lowercase keys.
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
|
DataMaze.test_file_format(name_file)
|
||||||
data_str = DataMaze.get_file_data(name_file)
|
data_str = DataMaze.get_file_data(name_file)
|
||||||
data_dict = DataMaze.transform_data(data_str)
|
data_dict = DataMaze.transform_data(data_str)
|
||||||
DataMaze.verif_key_data(data_dict)
|
DataMaze.verif_key_data(data_dict)
|
||||||
|
|||||||
Reference in New Issue
Block a user