-
Notifications
You must be signed in to change notification settings - Fork 755
Solution #666
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
Open
AndrewGalynin
wants to merge
2
commits into
mate-academy:master
Choose a base branch
from
AndrewGalynin:develop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Solution #666
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,144 @@ | ||
| from typing import Tuple, Optional | ||
|
|
||
|
|
||
| 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: Tuple[int, int], | ||
| end: Tuple[int, int], | ||
| is_drowned: bool = False | ||
| ) -> None: | ||
| self.decks = [] | ||
| self.is_drowned = is_drowned | ||
|
|
||
| r1, c1 = start | ||
| r2, c2 = end | ||
|
|
||
| for r_var in range(min(r1, r2), max(r1, r2) + 1): | ||
| for c_var in range(min(c1, c2), max(c1, c2) + 1): | ||
| self.decks.append(Deck(r_var, c_var)) | ||
|
|
||
| def get_deck(self, row, column): | ||
| # Find the corresponding deck in the list | ||
| pass | ||
| def get_deck(self, row: int, column: int) -> Optional[Deck]: | ||
| for deck in self.decks: | ||
| if deck.row == row and deck.column == column: | ||
| return deck | ||
| return None | ||
|
|
||
| def fire(self, row, column): | ||
| # Change the `is_alive` status of the deck | ||
| # And update the `is_drowned` value if it's needed | ||
| pass | ||
| def fire(self, row: int, column: int) -> None: | ||
| deck = self.get_deck(row, column) | ||
|
|
||
| if deck and deck.is_alive: | ||
| deck.is_alive = False | ||
|
|
||
| self.is_drowned = all( | ||
| not d.is_alive for d in self.decks | ||
| ) | ||
|
|
||
|
|
||
| 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 = {} | ||
| self.ships = [] | ||
|
|
||
| for start, end in ships: | ||
| ship = Ship(start, end) | ||
| self.ships.append(ship) | ||
|
|
||
| for deck in ship.decks: | ||
| self.field[(deck.row, deck.column)] = ship | ||
|
|
||
| self._validate_field() | ||
|
|
||
| def _validate_field(self) -> None: | ||
| if len(self.ships) != 10: | ||
| raise ValueError("The total number of the ships should be 10.") | ||
|
|
||
| sizes_count = {1: 0, 2: 0, 3: 0, 4: 0} | ||
|
|
||
| for ship in self.ships: | ||
| size = len(ship.decks) | ||
| if size not in sizes_count: | ||
| raise ValueError(f"Invalid ship size detected: {size}") | ||
|
|
||
| sizes_count[size] += 1 | ||
|
|
||
| for deck in ship.decks: | ||
| if not (0 <= deck.row < 10 and 0 <= deck.column < 10): | ||
| raise ValueError(f"Ship deck {(deck.row, deck.column)} " | ||
| f"is out of bounds.") | ||
|
|
||
| for dr in [-1, 0, 1]: | ||
| for dc in [-1, 0, 1]: | ||
| neighbor = (deck.row + dr, deck.column + dc) | ||
| if (neighbor in self.field | ||
| and self.field[neighbor] != ship): | ||
| raise ValueError("Ships shouldn't be located " | ||
| "in the neighboring cells.") | ||
|
|
||
| expected_sizes = {1: 4, 2: 3, 3: 2, 4: 1} | ||
| if sizes_count != expected_sizes: | ||
| raise ValueError(f"Invalid distribution of ships. " | ||
| f"Expected {expected_sizes}, " | ||
| f"got {sizes_count}") | ||
|
|
||
| def fire(self, location: tuple) -> str: | ||
| if location not in self.field: | ||
| return "Miss!" | ||
|
|
||
| row, column = location | ||
| ship = self.field[location] | ||
|
|
||
| ship.fire(row, column) | ||
|
|
||
| if ship.is_drowned: | ||
| return "Sunk!" | ||
|
|
||
| return "Hit!" | ||
|
|
||
| def print_field(self) -> None: | ||
| for r_coords in range(10): | ||
| row_symbols = [] | ||
| for c_coords in range(10): | ||
| if (r_coords, c_coords) in self.field: | ||
| ship = self.field[(r_coords, c_coords)] | ||
| deck = ship.get_deck(r_coords, c_coords) | ||
|
|
||
| if ship.is_drowned: | ||
| row_symbols.append("x") | ||
| elif not deck.is_alive: | ||
| row_symbols.append("*") | ||
| else: | ||
| row_symbols.append(u"\u25A1") # □ | ||
| else: | ||
| row_symbols.append("~") | ||
|
|
||
| print(" ".join(row_symbols)) | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| battle_ship = Battleship( | ||
| ships=[ | ||
| ((0, 0), (0, 3)), | ||
| ((0, 5), (0, 6)), | ||
| ((0, 8), (0, 9)), | ||
| ((2, 0), (4, 0)), | ||
| ((2, 4), (2, 6)), | ||
| ((2, 8), (2, 9)), | ||
| ((9, 9), (9, 9)), | ||
| ((7, 7), (7, 7)), | ||
| ((7, 9), (7, 9)), | ||
| ((9, 7), (9, 7)), | ||
| ] | ||
| ) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 nested loop logic for creating ship decks is incorrect. For a ship defined by its endpoints, such as
((0, 0), (1, 1)), this code would create a 2x2 square of decks rather than a straight line. Battleship ships must be either horizontal or vertical. You should add a check to ensure that either the row or column coordinates of the start and end points are the same, and then iterate only along the other axis to create the decks.