From b902d83d90d494532b5370783d7cc167bfc16087 Mon Sep 17 00:00:00 2001 From: Faraphel Date: Mon, 9 Jan 2023 16:04:49 +0100 Subject: [PATCH] renamed some directory to avoid conflit and improve readability --- .gitignore | 1 + main.pyw | 3 +-- {src => source}/Board.py | 28 ++++++++++---------- {src => source}/Boat.py | 2 +- {src => source}/__init__.py | 0 {src/enum => source/enums}/__init__.py | 0 {src/enum => source/enums}/bomb.py | 0 {src/enum => source/enums}/orientation.py | 0 {src => source}/error/InvalidBoatPosition.py | 2 +- {src => source}/error/PositionAlreadyShot.py | 0 {src => source}/error/__init__.py | 0 {src => source}/utils/__init__.py | 0 {src => source}/utils/copy_array_offset.py | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) rename {src => source}/Board.py (81%) rename {src => source}/Boat.py (95%) rename {src => source}/__init__.py (100%) rename {src/enum => source/enums}/__init__.py (100%) rename {src/enum => source/enums}/bomb.py (100%) rename {src/enum => source/enums}/orientation.py (100%) rename {src => source}/error/InvalidBoatPosition.py (88%) rename {src => source}/error/PositionAlreadyShot.py (100%) rename {src => source}/error/__init__.py (100%) rename {src => source}/utils/__init__.py (100%) rename {src => source}/utils/copy_array_offset.py (93%) diff --git a/.gitignore b/.gitignore index 214fd7a..05b9bf6 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ dmypy.json # Pyre type checker .pyre/ +/.idea/ /.idea/.gitignore /.idea/discord.xml /.idea/markdown.xml diff --git a/main.pyw b/main.pyw index 40f3c09..ad70233 100644 --- a/main.pyw +++ b/main.pyw @@ -6,8 +6,7 @@ from gui.scene import HelloWorldScene, FPSCounterScene # Créer une fenêtre window = Window(resizable=True, visible=False) -window.add_scene(HelloWorldScene()) -window.add_scene(FPSCounterScene()) +window.add_scene(HelloWorldScene(), FPSCounterScene()) # Lance la fenêtre window.set_visible(True) diff --git a/src/Board.py b/source/Board.py similarity index 81% rename from src/Board.py rename to source/Board.py index 024e247..8024dd1 100644 --- a/src/Board.py +++ b/source/Board.py @@ -1,22 +1,22 @@ import numpy as np -from src import Boat -from src.enum import Orientation, BombState -from src.error import InvalidBoatPosition, PositionAlreadyShot -from src.utils import copy_array_offset +from source import Boat +from source.enums import Orientation, BombState +from source.error import InvalidBoatPosition, PositionAlreadyShot +from source.utils import copy_array_offset class Board: - __slots__ = ("width", "height", "_boats", "_bombs") + __slots__ = ("_width", "_height", "_boats", "_bombs") def __init__(self, width: int, height: int = None) -> None: - self.width: int = width - self.height: int = width if height is None else height + self._width: int = width + self._height: int = width if height is None else height self._boats: dict[Boat, tuple[int, int]] = {} # associate the boats to their position - self._bombs: np.array = np.ones((self.width, self.height), dtype=np.bool_) + self._bombs: np.array = np.ones((self._width, self._height), dtype=np.bool_) def __repr__(self) -> str: - return f"<{self.__class__.__name__} width={self.width}, height={self.height}>" + return f"<{self.__class__.__name__} width={self._width}, height={self._height}>" def __str__(self) -> str: return str(self.get_matrice()) @@ -30,21 +30,22 @@ class Board: """ # get the sum of the boat - boat_sum: int = boat.get_matrice().sum() + boat_mat: np.array = boat.get_matrice() + boat_mat_sum: int = boat_mat.sum() # get the old board matrice sum board_mat: np.array = self.get_matrice() board_mat_sum_old: int = board_mat.sum() # add the boat to the board matrice - copy_array_offset(boat.get_matrice(), board_mat, offset=position) + copy_array_offset(boat_mat, board_mat, offset=position) # get the new board matrice sum board_mat_sum_new: int = board_mat.sum() # if the sum of the old board plus the boat sum is different from the new board sum, # then the boat have been incorrectly placed (overlapping, outside of bounds, ...) - if board_mat_sum_old + boat_sum != board_mat_sum_new: raise InvalidBoatPosition(boat, position) + if board_mat_sum_old + boat_mat_sum != board_mat_sum_new: raise InvalidBoatPosition(boat, position) # otherwise accept the boat in the boats dict self._boats[boat] = position @@ -94,7 +95,7 @@ class Board: """ :return: the boat represented as a matrice """ - board = np.zeros((self.width, self.height), dtype=np.ushort) + board = np.zeros((self._width, self._height), dtype=np.ushort) for index, (boat, position) in enumerate(self._boats.items(), start=1): # Paste the boat into the board at the correct position. @@ -116,4 +117,3 @@ if __name__ == "__main__": print(board.bomb((4, 4))) print(board) - diff --git a/src/Boat.py b/source/Boat.py similarity index 95% rename from src/Boat.py rename to source/Boat.py index 4bc76ed..52a3cd0 100644 --- a/src/Boat.py +++ b/source/Boat.py @@ -1,6 +1,6 @@ import numpy as np -from src.enum import Orientation +from source.enums import Orientation class Boat: diff --git a/src/__init__.py b/source/__init__.py similarity index 100% rename from src/__init__.py rename to source/__init__.py diff --git a/src/enum/__init__.py b/source/enums/__init__.py similarity index 100% rename from src/enum/__init__.py rename to source/enums/__init__.py diff --git a/src/enum/bomb.py b/source/enums/bomb.py similarity index 100% rename from src/enum/bomb.py rename to source/enums/bomb.py diff --git a/src/enum/orientation.py b/source/enums/orientation.py similarity index 100% rename from src/enum/orientation.py rename to source/enums/orientation.py diff --git a/src/error/InvalidBoatPosition.py b/source/error/InvalidBoatPosition.py similarity index 88% rename from src/error/InvalidBoatPosition.py rename to source/error/InvalidBoatPosition.py index 733dfd2..8e31422 100644 --- a/src/error/InvalidBoatPosition.py +++ b/source/error/InvalidBoatPosition.py @@ -1,4 +1,4 @@ -from src import Boat +from source import Boat class InvalidBoatPosition(Exception): diff --git a/src/error/PositionAlreadyShot.py b/source/error/PositionAlreadyShot.py similarity index 100% rename from src/error/PositionAlreadyShot.py rename to source/error/PositionAlreadyShot.py diff --git a/src/error/__init__.py b/source/error/__init__.py similarity index 100% rename from src/error/__init__.py rename to source/error/__init__.py diff --git a/src/utils/__init__.py b/source/utils/__init__.py similarity index 100% rename from src/utils/__init__.py rename to source/utils/__init__.py diff --git a/src/utils/copy_array_offset.py b/source/utils/copy_array_offset.py similarity index 93% rename from src/utils/copy_array_offset.py rename to source/utils/copy_array_offset.py index 5cf7248..89f609f 100644 --- a/src/utils/copy_array_offset.py +++ b/source/utils/copy_array_offset.py @@ -4,7 +4,7 @@ import numpy as np def copy_array_offset(src: np.array, dst: np.array, offset: tuple[int, int]) -> None: """ Copy a numpy array into another one with an offset - :src: source array + :source: source array :dst: destination array :offset: the offset where to copy the array """