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.

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

Jump to bottom

Provisional fix for Issue #130 #131

Merged
merged 1 commit into from
Sep 8, 2018
Merged

Provisional fix for Issue #130 #131

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
4 changes: 2 additions & 2 deletions src/mapDistanceFunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ float euclideanDistanceOnHexagonalPlanarMap(const unsigned int som_x, const unsi
if (ydist & 1) {
xdist += ((y1 & 1) ? -0.5 : 0.5);
}
return sqrt(float(xdist * xdist + ydist * ydist));
return sqrt(float(xdist * xdist + ydist * ydist * 0.75));
}

float euclideanDistanceOnHexagonalToroidMap(const unsigned int som_x, const unsigned int som_y, const unsigned int x, const unsigned int y, const unsigned int nSomX, const unsigned int nSomY) {
Expand All @@ -64,7 +64,7 @@ float euclideanDistanceOnHexagonalToroidMap(const unsigned int som_x, const unsi
if (ydist & 1) {
xdist += ((y1 & 1) ? -0.5 : 0.5);
}
return sqrt(float(xdist * xdist + ydist * ydist));
return sqrt(float(xdist * xdist + ydist * ydist * 0.75));
}

float gaussianNeighborhood(float distance, float radius, float std_coeff) {
Expand Down