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

Refactor: Extract functions

Browse Source
This commit is contained in:
Pitchaya Boonsarngsuk
2018-01-19 09:29:14 +00:00
parent 1d711f828d
commit feec778c62
12 changed files with 351 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/hybridSimulation.js
View File

@@ -1,8 +1,9 @@
import { dispatch } from "d3-dispatch";
import constant from "./constant";
import interpolation from "./interpolation";
import interpolationPivots from "./interpolationPivots";
import interpBruteForce from "./interpolation/interpBruteForce";
import interpolationPivots from "./interpolation/interpolationPivots";
import neighbourSamplingDistance from "./neighbourSamplingDistance";
import { takeSampleFrom } from "./interpolation/helpers";
export default function (nodes, config) {
@@ -21,10 +22,9 @@ export default function (nodes, config) {
NUMPIVOTS = config.hasOwnProperty("numPivots") ? config.numPivots : 3,
event = d3.dispatch("sampleTick", "fullTick", "startFull", "end");
var sets = sampleFromNodes(nodes, Math.sqrt(nodes.length));
var sets = takeSampleFrom(nodes, Math.sqrt(nodes.length));
var sample = sets.sample;
var remainder = sets.remainder;
var sampleSubset = sampleFromNodes(sample, Math.sqrt(sample.length)).sample;
var sampleSimulation = d3.forceSimulation(sample)
.stop()
@@ -46,15 +46,19 @@ export default function (nodes, config) {
.alpha(1).restart();
function ended() {
sample.forEach(function (d) {
d.vx = 0;
d.vy = 0;
});
event.call("startFull");
console.log("Ended sample simulation");
alert('About to interpolate');
interpolation(sample, remainder, sampleSubset, distanceFn);
interpBruteForce(sample, remainder, distanceFn);
/*
if (PIVOTS) {
interpolationPivots(sample, remainder, sampleSubSet, NUMPIVOTS, distance);
} else {
interpolation(sample, remainder, sampleSubSet, distance);
interpBruteForce(sample, remainder, sampleSubSet, distance);
}
*/
event.call("fullTick");