Skip to content

Get hex line bug with zero length #25

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
Annakan wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Get hex line bug with zero length #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
031df7a
get_hex_line return a wrongly shaped array when the line distance is …
Annakan Jan 17, 2023
c7b52c5
semicolons wound pythonystas very badly, save the pythonistas
Annakan Jan 17, 2023
8a72660
Adding test for the one hex line case
Annakan Jan 17, 2023
8ab7f3b
Duplicate get_spiral test code in test_selection
Annakan Jan 17, 2023
dd3a0e1
semicolons wound pythonystas very badly, really, they do... save the …
Annakan Jan 17, 2023
b120a5a
Add investigative TODO
Annakan Jan 28, 2023
ace07da
In the case of a line reduced to a dot we have to return a 2D array o…
Annakan Jan 28, 2023
0f90b4e
Forget to fix test, assumption was made that returning a one hex line…
Annakan Feb 11, 2023
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
4 changes: 2 additions & 2 deletions hexy/hexy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def get_spiral(center, radius_start=1, radius_end=2):
return np.array(hex_area)


def get_hex_line(hex_start, hex_end):
def get_hex_line(hex_start, hex_end): # TODO start and end seems to not be commutative, why ?
"""
Get hexes on line from hex_start to hex_end.
:param hex_start: The hex where the line starts.
Expand All @@ -124,7 +124,7 @@ def get_hex_line(hex_start, hex_end):
"""
hex_distance = get_cube_distance(hex_start, hex_end)
if hex_distance < 1:
return np.array([hex_start])
return np.array([hex_start.copy()])

# Set up linear system to compute linearly interpolated cube points
bottom_row = np.array([i / hex_distance for i in np.arange(hex_distance)])
Expand Down
Empty file added test/test_base_map.py
View file
Open in desktop
Empty file.
10 changes: 8 additions & 2 deletions test/test_hex_line.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,16 @@ def test_get_hex_line():
start = np.array([-3, 3, 0])
end = np.array([1, 1, -2])
print(hx.get_hex_line(start, end))
print(expected);
print(expected)
assert(np.array_equal(
hx.get_hex_line(start, end),
expected));
expected))
# testing one hex line special case
one_hex_line = hx.get_hex_line(start, start)
assert len(one_hex_line) == 1
assert(np.array_equal(one_hex_line[0], start))
assert id(start) != id(one_hex_line)


if __name__ == "__main__":
test_get_hex_line()
8 changes: 4 additions & 4 deletions test/test_rounding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ def test_cube_round():
test_coords = np.array([
[1.1, -1.4, 0.3],
[3.3, 2.3, -5.4],
]);
])

expected_coords = np.array([
[1, -1, 0],
[3, 2, -5],
]);
])

assert(np.array_equal(hx.cube_round(test_coords), expected_coords))

def test_axial_round():
test_coords = np.array([
[1.1, -1.4],
[3.3, 2.3],
]);
])

expected_coords = np.array([
[1, -1],
[3, 2],
]);
])

assert(np.array_equal(hx.axial_round(test_coords), expected_coords))
16 changes: 0 additions & 16 deletions test/test_selections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,6 @@ def test_get_spiral():
_assert_np_array_equal(actual_array, expected_array)


def test_get_spiral():
start_radius = 2
end_radius = 4
expected = []
for r in range(start_radius, end_radius + 1):
expected += _get_linear_combinations(hx.W, hx.NW, r) + \
_get_linear_combinations(hx.NW, hx.NE, r) + \
_get_linear_combinations(hx.NE, hx.E, r) + \
_get_linear_combinations(hx.E, hx.SE, r) + \
_get_linear_combinations(hx.SE, hx.SW, r) + \
_get_linear_combinations(hx.SW, hx.W, r)

actual_array = hx.get_spiral([0, 0, 0], start_radius, end_radius)
expected_array = np.array(expected)
_assert_np_array_equal(actual_array, expected_array)


def test_get_disk():
expected = [[0, 0, 0]]
Expand Down