brian/d3-spring-model
1
0
Fork 0
Code Issues 3 Releases 4 Activity

Edited comments

Browse Source
This commit is contained in:
Pitchaya Boonsarngsuk
2018-03-21 16:08:32 +00:00
parent bda72e4fa8
commit 757b315309
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/hybridSimulation.js
View File

@@ -48,14 +48,13 @@ export default function (sim, forceS, forceF) {
// Performed on first run // Performed on first run
function initialize() { function initialize() {
initAlready = true; initAlready = true;
console.log("Initializing Hybrid");
alreadyRanIterations = 0; alreadyRanIterations = 0;
simulation simulation
.on("tick", sampleTick) .on("tick", sampleTick)
.on("end", sampleEnded) .on("end", sampleEnded)
.nodes(sample) .nodes(sample)
.force("Sample force", forceSample); .force("Sample force", forceSample);
console.log("Initialized Hybrid"); console.log("Initialized Simulation for Hybrid");
} }
function initForces(){ function initForces(){
@@ -91,7 +90,7 @@ export default function (sim, forceS, forceF) {
// Sample simulation ticked 1 frame, keep track of number of iterations here. // Sample simulation ticked 1 frame, keep track of number of iterations here.
function sampleTick() { function sampleTick() {
event.call("sampleTick"); event.call("sampleTick");
if(++alreadyRanIterations >= SAMPLE_ITERATIONS){ if(alreadyRanIterations++ >= SAMPLE_ITERATIONS){
sampleEnded(); sampleEnded();
} }
} }
@@ -99,7 +98,7 @@ export default function (sim, forceS, forceF) {
// Full simulation ticked 1 frame, keep track of number of iterations here. // Full simulation ticked 1 frame, keep track of number of iterations here.
function fullTick() { function fullTick() {
event.call("fullTick"); event.call("fullTick");
if(++alreadyRanIterations >= FULL_ITERATIONS){ if(alreadyRanIterations++ >= FULL_ITERATIONS){
fullEnded(); fullEnded();
} }
} }

1
src/link.js
View File

@@ -28,6 +28,7 @@ export default function() {
node.oldvy = node.vy; node.oldvy = node.vy;
} }
} }
// Each iteration in a tick // Each iteration in a tick
for (var k = 0, source, target, i, j, x, y, l; k < iterations; ++k) { for (var k = 0, source, target, i, j, x, y, l; k < iterations; ++k) {
// For each link // For each link