-
Notifications
You must be signed in to change notification settings - Fork 755
py_battleship #668
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
py_battleship #668
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,65 @@ | ||
| 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, is_drowned: bool = False) -> None: | ||
| self.start = start | ||
| self.end = end | ||
| self.is_drowned = is_drowned | ||
| 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: | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
||
| (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)] | ||
|
|
||
| if 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) -> None | Deck: | ||
| 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 | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This violates checklist item #4: 'Remove unused attributes.' The |
||
| 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 | Ship: | ||
|
||
| row, col = location | ||
|
|
||
| if (row, col) not in self.field: | ||
| return "Miss!" | ||
|
|
||
| ship = self.field[(row, col)] | ||
| return ship.fire(row, col) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's a type hint mismatch here. |
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This attribute
is_drownedis assigned a value but is never used anywhere in the code. According to checklist item #4, all attributes defined in__init__must be used. Please remove this attribute and its assignments if it's not needed.