[11] AI does not shoot twice at the same position

Author: Célande Adrien

tests/test_battleship.py

@@ -1,7 +1,8 @@
 import unittest
 
-from torpydo.battleship import parse_position, is_fleet_down
+from torpydo.battleship import parse_position, is_fleet_down, get_random_position
 from torpydo.ship import Color, Letter, Position, Ship
+from unittest.mock import patch
 
 class TestBattleship(unittest.TestCase):
     def setUp(self):
@@ -16,6 +17,20 @@ def test_is_fleet_down(self):
         self.ships[0].is_sunk = True
         self.assertTrue(is_fleet_down(self.ships))
 
+    @patch("torpydo.battleship.NUMBER_ROWS", 2)
+    @patch("torpydo.battleship.NUMBER_COL", 2)
+    def test_random_duplicate_position(self):
+        for i in range(10):
+            board = []
+            x = [
+                get_random_position(board),
+                get_random_position(board),
+                get_random_position(board),
+                get_random_position(board),
+            ]
+            y = list(set(x))
+            self.assertTrue(len(y) == 4)
+
 def init_ship(ship: Ship, positions: list):
     ship.positions = positions
 

torpydo/battleship.py

@@ -10,12 +10,15 @@
 from torpydo.telemetryclient import TelemetryClient
 
 import time
-print("Starting")
 
 myFleet = []
 enemyFleet = []
+board = []
 BAD_POSITION_INPUT_MSG = "The position is invalid. Please try enter a letter and a number like: 'A1'"
+NUMBER_ROWS = 8
+NUMBER_COL = 8
 
+print("Starting")
 
 def main():
     TelemetryClient.init()
@@ -88,6 +91,7 @@ def start_game():
         end_colouring()
 
         is_hit = GameController.check_is_hit(enemyFleet, position)
+        add_position_to_board(board, position, True)
 
         start_colouring(right_colour(is_hit))
         print("Yeah ! Nice hit !" if is_hit else "Miss")
@@ -115,6 +119,7 @@ def start_game():
         # Computer
         position = get_random_position()
         is_hit = GameController.check_is_hit(myFleet, position)
+        add_position_to_board(board, position, True)
         start_colouring(right_colour(is_hit))
 
         print()
@@ -147,15 +152,30 @@ def parse_position(input: str):
 
     return Position(letter, number)
 
-def get_random_position():
-    rows = 8
-    lines = 8
+def add_position_to_board(board: list, position: Position, is_shot = None):
+    if is_shot is True:
+        position.is_shot = True
 
-    letter = Letter(random.randint(1, lines))
-    number = random.randint(1, rows)
-    position = Position(letter, number)
+    if position not in board:
+        board.append(position)
 
-    return position
+def get_random_position(board: list):
+    rows = NUMBER_ROWS
+    lines = NUMBER_COL
+
+    while True:
+        letter = Letter(random.randint(1, lines))
+        number = random.randint(1, rows)
+        position = Position(letter, number)
+        for pos in board:
+            if position == pos:
+                position = pos
+                break
+
+        add_position_to_board(board, position)
+        if not position.is_shot:
+            position.is_shot = True
+            return position
 
 def initialize_game():
     initialize_myFleet()

torpydo/ship.py

@@ -24,7 +24,10 @@ def __init__(self, column: Letter, row: int):
         self.is_shot = False
 
     def __eq__(self, other):
-        return self.__dict__ == other.__dict__
+        return self.column == other.column and self.row == other.row
+
+    def __hash__(self):
+        return hash(f"{self.column}_{self.row}")
 
     def __str__(self):
         return f"{self.column.name}{self.row}"