Merge pull request #131 from MattWenham/master

Provisional fix for Issue #130
peterwittek · Sep 8, 2018 · c31602f · c31602f
2 parents 5c6ff90 + 21c7db5
commit c31602f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/mapDistanceFunctions.cpp b/src/mapDistanceFunctions.cpp
@@ -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) {
@@ -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) {