Skip to content

defined multiplication by integer and small bugfixes #1

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.

Sign up for GitHub

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
wolfgang-noichl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

defined multiplication by integer and small bugfixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions hexutil/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,16 @@ def __sub__(self, other):
def __neg__(self):
x, y = self
return Hex(-x, -y)


def __mul__(self, other):
x, y = self
if type(other) == int:
return Hex(other*x, other*y)
raise NotImplementedError()

def __rmul__(self, other):
return self * other

def distance(self, other):
"""Distance in number of hexagon steps.
Direct neighbours of this hex have distance 1.
Expand Down Expand Up @@ -186,7 +195,7 @@ class Rectangle(namedtuple("Rectangle", "x y width height")):
pass

def _tiled_range(lo, hi, tile_size):
return range(lo // tile_size, (hi + tile_size - 1) // tile_size)
return range(int(lo // tile_size), int((hi + tile_size - 1) // tile_size))

def _make_range(x, width, bloat, grid_size):
return _tiled_range(x + grid_size - 1 - bloat, x + width + bloat, grid_size)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
here = path.abspath(path.dirname(__file__))

# Get the long description from the README file
with open(path.join(here, 'README'), encoding='utf-8') as f:
with open(path.join(here, 'README.md'), encoding='utf-8') as f:
long_description = f.read()

setup(
Expand Down