Merge pull request jacomyal#707 from rangeonnicolas/master

Yomguithereal · Yomguithereal · commit ce0d42052a71 · 2016-02-15T11:55:21.000+01:00
ForceAtlas2 bug fix + correction of a unit test
diff --git a/plugins/sigma.layout.forceAtlas2/worker.js b/plugins/sigma.layout.forceAtlas2/worker.js
@@ -492,7 +492,7 @@
 
       // 2) Repulsion
       //--------------
-      // NOTES: adjustSize = antiCollision & scalingRatio = coefficient
+      // NOTES: adjustSizes = antiCollision & scalingRatio = coefficient
 
       if (W.settings.barnesHutOptimize) {
         coefficient = W.settings.scalingRatio;
@@ -522,7 +522,7 @@
                 xDist = NodeMatrix[np(n, 'x')] - RegionMatrix[rp(r, 'massCenterX')];
                 yDist = NodeMatrix[np(n, 'y')] - RegionMatrix[rp(r, 'massCenterY')];
 
-                if (W.settings.adjustSize) {
+                if (W.settings.adjustSizes) {
 
                   //-- Linear Anti-collision Repulsion
                   if (distance > 0) {
@@ -578,7 +578,7 @@
 
                 distance = Math.sqrt(xDist * xDist + yDist * yDist);
 
-                if (W.settings.adjustSize) {
+                if (W.settings.adjustSizes) {
 
                   //-- Linear Anti-collision Repulsion
                   if (distance > 0) {
@@ -630,7 +630,7 @@
             xDist = NodeMatrix[np(n1, 'x')] - NodeMatrix[np(n2, 'x')];
             yDist = NodeMatrix[np(n1, 'y')] - NodeMatrix[np(n2, 'y')];
 
-            if (W.settings.adjustSize) {
+            if (W.settings.adjustSizes) {
 
               //-- Anticollision Linear Repulsion
               distance = Math.sqrt(xDist * xDist + yDist * yDist) -
