Merge pull request #131 from MattWenham/master

peterwittek · web-flow · commit c31602f015f3 · 2018-09-08T20:21:59.000Z
Provisional fix for Issue #130
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) {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ float euclideanDistanceOnHexagonalPlanarMap(const unsigned int som_x, const unsi`
`51`	`51`	`if (ydist & 1) {`
`52`	`52`	`xdist += ((y1 & 1) ? -0.5 : 0.5);`
`53`	`53`	`}`
`54`		`- return sqrt(float(xdist * xdist + ydist * ydist));`
	`54`	`+ return sqrt(float(xdist * xdist + ydist * ydist * 0.75));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`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`
`64`	`64`	`if (ydist & 1) {`
`65`	`65`	`xdist += ((y1 & 1) ? -0.5 : 0.5);`
`66`	`66`	`}`
`67`		`- return sqrt(float(xdist * xdist + ydist * ydist));`
	`67`	`+ return sqrt(float(xdist * xdist + ydist * ydist * 0.75));`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`float gaussianNeighborhood(float distance, float radius, float std_coeff) {`