From 6182a5fc2623e5540e8088e61bbadb793facd8ca Mon Sep 17 00:00:00 2001 From: Pitchaya Boonsarngsuk <2285135b@student.gla.ac.uk> Date: Tue, 13 Feb 2018 18:42:29 +0000 Subject: [PATCH] Change logging --- examples/js/src/example-papaparsing.js | 6 +++--- examples/js/src/example-papaparsing/hybrid.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/js/src/example-papaparsing.js b/examples/js/src/example-papaparsing.js index 27bf618..8626b45 100644 --- a/examples/js/src/example-papaparsing.js +++ b/examples/js/src/example-papaparsing.js @@ -227,9 +227,6 @@ function ended() { return d.y*MULTIPLIER; }); //} - console.log("Post stress", d3.calculateStress(nodes, function (n, m) { - return distanceFunction(n, m, props, norm); - })); if (p1 !== 0) { // Performance time measurement @@ -243,6 +240,9 @@ function ended() { p1 = 0; p2 = 0; } + console.log("Post stress", d3.calculateStress(nodes, function (n, m) { + return distanceFunction(n, m, props, norm); + })); } function brushEnded() { diff --git a/examples/js/src/example-papaparsing/hybrid.js b/examples/js/src/example-papaparsing/hybrid.js index c42113d..a53c51f 100644 --- a/examples/js/src/example-papaparsing/hybrid.js +++ b/examples/js/src/example-papaparsing/hybrid.js @@ -16,12 +16,13 @@ function startHybridSimulation() { let forceSample = d3.forceNeighbourSampling() .neighbourSize(NEIGHBOUR_SIZE) .sampleSize(SAMPLE_SIZE) - .stableVelocity(0) + .stableVelocity(0.43) .distance(distance) let forceFull = d3.forceNeighbourSampling() .neighbourSize(FULL_NEIGHBOUR_SIZE) .sampleSize(FULL_SAMPLE_SIZE) + .stableVelocity(0.6) .distance(distance) let hybridSimulation = d3.hybridSimulation(simulation, forceSample, forceFull)