Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ ignore = E203, E266, W503, ANN002, ANN003, ANN101, ANN102, ANN401, N807, N818
max-line-length = 79
max-complexity = 18
select = B,C,E,F,W,T4,B9,ANN,Q0,N8,VNE
exclude = venv, tests
exclude = venv, tests, .venv
80 changes: 55 additions & 25 deletions app/main.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,64 @@
class Deck:
def __init__(self, row, column, is_alive=True):
pass
def __init__(self, row: int, column: int, is_alive: bool = True) -> None:
self.row = row
self.column = column
self.is_alive = is_alive


class Ship:
def __init__(self, start, end, is_drowned=False):
# Create decks and save them to a list `self.decks`
pass
def __init__(self, start: int, end: int) -> None:
self.start = start
self.end = end
self.decks = self._create_decks()

def get_deck(self, row, column):
# Find the corresponding deck in the list
pass
def _create_decks(self) -> list | str:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return type hint for this method seems incorrect. It returns a list of Deck objects, but the hint suggests it could also return a string. Please update the type hint to list or list[Deck] to accurately reflect the return value.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return type hint for this method is still incorrect. It should be list[Deck] since it returns a list of Deck objects. This was mentioned in the previous review.

(r1, c1), (r2, c2) = self.start, self.end

def fire(self, row, column):
# Change the `is_alive` status of the deck
# And update the `is_drowned` value if it's needed
pass
if r1 == r2:
start, end = sorted([c1, c2])
return [Deck(r1, c) for c in range(start, end + 1)]

elif c1 == c2:
start, end = sorted([r1, r2])
return [Deck(r, c1) for r in range(start, end + 1)]

raise ValueError

def get_deck(self, row: int, column: int) -> list[Deck]:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return type hint here is incorrect. This method returns a single Deck instance or None, not a list of decks. The type hint should reflect this, for example: Deck | None.

for deck in self.decks:
if deck.row == row and deck.column == column:
return deck

return None

def fire(self, row: int, column: int) -> None | str:
deck = self.get_deck(row, column)
if deck is None:
return None

deck.is_alive = False

if all(not d.is_alive for d in self.decks):
self.is_drowned = True

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This violates checklist item #4: 'Remove unused attributes.' The is_drowned attribute is assigned here but never used anywhere in the code. This was also mentioned in the previous review.

return "Sunk!"

return "Hit!"


class Battleship:
def __init__(self, ships):
# Create a dict `self.field`.
# Its keys are tuples - the coordinates of the non-empty cells,
# A value for each cell is a reference to the ship
# which is located in it
pass

def fire(self, location: tuple):
# This function should check whether the location
# is a key in the `self.field`
# If it is, then it should check if this cell is the last alive
# in the ship or not.
pass
def __init__(self, ships: list) -> None:
self.field = {}

for start, end in ships:
ship = Ship(start, end)
for deck in ship.decks:
self.field[(deck.row, deck.column)] = ship

def fire(self, location: tuple) -> str:
row, col = location

if (row, col) not in self.field:
return "Miss!"

ship = self.field[(row, col)]
return ship.fire(row, col)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a type hint mismatch here. Battleship.fire is hinted to return str (line 57), but it returns the result of ship.fire(), which is hinted to return None | str (line 34). While the current logic prevents None from being returned, this inconsistency makes the code harder to reason about. Please align the type hints to ensure consistency.