Merge remote-tracking branch 'origin/master' into withConsoleLog

This commit is contained in:
Pitchaya Boonsarngsuk committed 2018-02-12 08:07:05 +00:00
commit 054ff7312e
4 files changed
+4 -4

No files matched your search

+1 -1
View File
@@ -54,7 +54,7 @@ export default function() {
node = nodes[i];
velocityDiff += Math.abs(Math.hypot(node.vx-node.oldvx, node.vy-node.oldvy));
}
velocityDiff /= n*(n-1);
velocityDiff /= n;
latestVelocityDiff = velocityDiff;
if(velocityDiff<stableVelocity){
+1 -1
View File
@@ -60,7 +60,7 @@ export default function () {
node = nodes[i];
velocityDiff += Math.abs(Math.hypot(node.vx-node.oldvx, node.vy-node.oldvy));
}
velocityDiff /= n*(neighbourSize+sampleSize);
velocityDiff /= n;
latestVelocityDiff = velocityDiff;
if(velocityDiff<stableVelocity){