public/py-tools
1
0
Fork 0
Code Issues Pull Requests Actions Releases 8 Activity

Compare commits

base: public:2bec56eb1ca01c13f68ef1e3cb2e55da9bc3b70e
Branches Tags
public:main
public:0.4.0
public:0.3.6
public:0.3.5
public:0.3.4
public:0.3.3
public:0.3.2
public:0.3.1
public:0.3
..
compare: public:b2cc1e814c3dea3b2582c2b85726db387acfca3d
Branches Tags
public:main
public:0.4.0
public:0.3.6
public:0.3.5
public:0.3.4
public:0.3.3
public:0.3.2
public:0.3.1
public:0.3

2 Commits
2bec56eb1c ... b2cc1e814c

Author SHA1 Message Date
Stefan Harmuth
b2cc1e814c FIX Coordinate().getNeighbours() min/maxY
All checks were successful
Publish to PyPI / Publish to PyPI (push) Successful in 1m4s
Details 
FIX Coordinate() not hashable after implementing __eq__
 2023-12-17 08:24:19 +01:00
Stefan Harmuth
42cbf6f85c Coordinate().__eq__: enable comparison with tuples 2023-12-17 07:21:00 +01:00
1 changed files with 10 additions and 1 deletions
Show Stats Expand all files Collapse all files

11
src/tools/coordinate.py
View File

@ -187,7 +187,7 @@ class Coordinate(tuple):
nb_list = [(-1, 0), (1, 0), (0, -1), (0, 1)] nb_list = [(-1, 0), (1, 0), (0, -1), (0, 1)]
for dx, dy in nb_list: for dx, dy in nb_list:
if minX <= self[0] + dx <= maxX and minY <= self[0] + dy <= maxY: if minX <= self[0] + dx <= maxX and minY <= self[1] + dy <= maxY:
yield self.__class__(self[0] + dx, self[1] + dy) yield self.__class__(self[0] + dx, self[1] + dy)
else: else:
if includeDiagonal: if includeDiagonal:
@ -261,6 +261,15 @@ class Coordinate(tuple):
else: else:
return self.__class__(-self[0], -self[1], -self[2]) return self.__class__(-self[0], -self[1], -self[2])
def __hash__(self) -> int:
return hash((self[0], self[1], self[2]))
def __eq__(self, other: Coordinate | tuple) -> bool:
if self[2] is None:
return self[0] == other[0] and self[1] == other[1]
else:
return self[0] == other[0] and self[1] == other[1] and self[2] == other[2]
def __add__(self, other: Coordinate | tuple) -> Coordinate: def __add__(self, other: Coordinate | tuple) -> Coordinate:
if self[2] is None: if self[2] is None:
return self.__class__(self[0] + other[0], self[1] + other[1]) return self.__class__(self[0] + other[0], self[1] + other[1])