Skip to content
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

Develop #435

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 2 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
116 changes: 91 additions & 25 deletions app/main.py
Original file line number Diff line number Diff line change
@@ -1,34 +1,100 @@
class Deck:
def __init__(self, row, column, is_alive=True):
pass
def __init__(
self, row: int,
column: int,
is_alive: bool = True,
is_hit: bool = False
) -> None:
self.row = row
self.column = column
self.is_alive = is_alive
self.is_hit = is_hit


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 = [
Deck(row, column)
for row in range(start[0], end[0] + 1)
for column in range(start[1], end[1] + 1)
]

def get_deck(self, row, column):
# Find the corresponding deck in the list
pass
def get_deck(self, row: int, column: int) -> Deck:
for deck in self.decks:
if deck.row == row and deck.column == column:
return deck

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:
deck.is_alive = False
deck.is_hit = True

Choose a reason for hiding this comment

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

This is redundant
deck.is_alive always equal to not deck.is_hit

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


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[tuple]) -> None:
self.field = {}
self.ships = ships
self._validate_field()

for location in ships:
ship = Ship(location[0], location[1])
for row in range(location[0][0], location[1][0] + 1):
for column in range(location[0][1], location[1][1] + 1):
self.field[(row, column)] = ship

Choose a reason for hiding this comment

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

You can iterate over ship.decks


def fire(self, location: tuple) -> str:
if location not in self.field:
return "Miss!"

ship = self.field[location]
ship.fire(location[0], location[1])

if ship.is_drowned:
return "Sunk!"
return "Hit!"

def print_field(self) -> None:
for row in range(10):
for col in range(10):
if (row, col) not in self.field:
print("~", end=" ")
ship = self.field.get((row, col))
if ship:
if ship.is_drowned:
print("x", end=" ")
deck = ship.get_deck(row, col)
if deck.is_alive:
print("\u25A1", end=" ")
elif deck.is_hit and not ship.is_drowned:
print("*", end=" ")
print()

def _validate_field(self) -> None:
total_ships = len(self.ships)
single_deck = double_deck = triple_deck = quadruple_deck = 0

for start, end in self.ships:
rows = set(range(start[0], end[0] + 1))
cols = set(range(start[1], end[1] + 1))

if len(rows) == 1 and len(cols) == 1:
single_deck += 1
elif len(rows) == 2 or len(cols) == 2:
double_deck += 1
elif len(rows) == 3 or len(cols) == 3:
triple_deck += 1
elif len(rows) == 4 or len(cols) == 4:
quadruple_deck += 1

if (total_ships != 10
or single_deck != 4
or double_deck != 3
or triple_deck != 2
or quadruple_deck != 1):
raise ValueError("Invalid ship placement!")
Loading