Develop #491
Develop #491
Conversation
app/main.py
Outdated
| for i in range(start[1], end[1] + 1): | ||
| result.append(Deck(start[0], i)) |
There was a problem hiding this comment.
Use more descriptive variable. column, for example or row in other case
| # 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 | ||
| self.ships = {coords: Ship(coords[0], coords[1]) for coords in ships} |
There was a problem hiding this comment.
Why are you using dict here? Almost in all other methods you are using .values() to get data. So why can't we create simple list?
P.S. I'm not saying that you're wrong, you can prove your point and argue for using dict
There was a problem hiding this comment.
task's condition says to use dictionary and keys help me in method where i find all cells around the ship in which other ships can't be located
app/main.py
Outdated
| def print_field(self) -> None: | ||
| decks = [] | ||
| for ship in self.ships.values(): | ||
| if ship.is_drowned: | ||
| for deck in ship.decks: | ||
| deck.symbol = "x" | ||
| decks.append(deck) | ||
| else: | ||
| for deck in ship.decks: | ||
| if deck.is_alive: | ||
| deck.symbol = "\u25A1" | ||
| if not deck.is_alive: | ||
| deck.symbol = "*" | ||
| decks.append(deck) | ||
| symbols_list = [] | ||
| is_found = False | ||
| for row, column in self.field: | ||
| for index, deck in enumerate(decks): | ||
| if deck.row == row and deck.column == column: | ||
| symbols_list.append(deck.symbol) | ||
| is_found = True | ||
| break | ||
| if index == len(decks) - 1: | ||
| is_found = False | ||
|
|
||
| if not is_found: | ||
| symbols_list.append("~") | ||
|
|
||
| symbols = "" | ||
| for index, symbol in enumerate(symbols_list): | ||
| if index % 10 == 0 and index != 0: | ||
| symbols += "\n" | ||
| symbols += f"{symbol} " | ||
|
|
||
| print(symbols) |
There was a problem hiding this comment.
It's hard to read this method. We should simplify it.
- Let's first create a 10x10 grid initialized with water symbols(
~) - Then fill the grid with ship symbols(+ check their status)
- Create single string of symbols
app/main.py
Outdated
| condition = (0 <= x_[0] < 10 | ||
| and 0 <= x_[1] < 10 | ||
| and 0 <= y_[0] < 10 | ||
| and 0 <= y_[1] < 10) | ||
| if not condition: | ||
| raise VisibilityError |
app/main.py
Outdated
| one_decks = 0 | ||
| two_decks = 0 | ||
| three_decks = 0 | ||
| four_decks = 0 | ||
| ships = [ship.decks for ship in self.ships.values()] | ||
|
|
||
| for ship in ships: | ||
| if len(ship) == 1: | ||
| one_decks += 1 | ||
| if len(ship) == 2: | ||
| two_decks += 1 | ||
| if len(ship) == 3: | ||
| three_decks += 1 | ||
| if len(ship) == 4: | ||
| four_decks += 1 |
There was a problem hiding this comment.
We can create it as a dictionary {1(first deck): 0, 2(second deck): 0}
app/main.py
Outdated
| invalid_cells = [] | ||
| for coord in coords: | ||
| cells = self._get_invalid_cells_for_one_ship(coord) | ||
| invalid_cells += cells |
|
|
||
| def _get_invalid_cells_for_one_ship( | ||
| self, | ||
| coord: tuple |
There was a problem hiding this comment.
Add more descriptive annotation, check all funcs and methods
| if current_ship and not current_ship.is_drowned: | ||
| return "Hit!" | ||
| if current_ship and current_ship.is_drowned: | ||
| return "Sunk!" |
There was a problem hiding this comment.
After hitting a ship's deck, you should check whether all decks of that ship are "sunk" (i.e., is_alive = False) to return "Sunk!".
| current_ship = ship | ||
|
|
||
| if current_ship and not current_ship.is_drowned: | ||
| return "Hit!" |
There was a problem hiding this comment.
If other decks of the ship are still alive, return "Hit!".
app/main.py
Outdated
| return "Hit!" | ||
| if current_ship and current_ship.is_drowned: | ||
| return "Sunk!" | ||
| return "Miss!" |
There was a problem hiding this comment.
If no ship exists at the fired location, return "Miss!"
| for row in sea: | ||
| print(" ".join(row)) | ||
|
|
||
| def _validate_field(self) -> None: |
There was a problem hiding this comment.
Ensure that exactly 10 ships exist, with the correct number of ships of different sizes (1, 2, 3, and 4 decks).
No two ships should be adjacent, even diagonally.
There was a problem hiding this comment.
I do this check in the init method after creating the self.ships field as specified in the task condition. Logically, if any of the validation conditions is not met, an error will occur and we will not be able to access this method as well as others.
app/main.py
Outdated
| for cell in invalid_cells: | ||
| for deck in decks: | ||
| if cell[0] == deck.row and cell[1] == deck.column: | ||
| raise Exception("ships shouldn't be located in" |
There was a problem hiding this comment.
You could create your own Exception
No description provided.