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

Remove multiplier from neighbour sampling

Browse Source
This commit is contained in:
Pitchaya Boonsarngsuk
2018-01-15 11:21:47 +00:00
parent 3a93c843c9
commit c11c902e69
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/hybridSimulation.js
View File

@@ -16,8 +16,7 @@ export default function (nodes, config) {
FullneighbourSize = config.hasOwnProperty("fullNeighbourSize") ? config.fullNeighbourSize : 6,
FullsampleSize = config.hasOwnProperty("fullSampleSize") ? config.fullSampleSize : 3,
FulldistanceRange = config.hasOwnProperty("fullDistanceRange") ? config.fullDistanceRange : 10,
MULTIPLIER = config.hasOwnProperty("multiplier") ? config.multiplier : 50,
distance = config.hasOwnProperty("distance") ? config.distance : constant(300),
distanceFn = config.hasOwnProperty("distanceFn") ? config.distance : constant(300),
PIVOTS = config.hasOwnProperty("pivots") ? config.pivots : false,
NUMPIVOTS = config.hasOwnProperty("numPivots") ? config.numPivots : 3,
event = d3.dispatch("sampleTick", "fullTick", "startFull", "end");
@@ -40,8 +39,7 @@ export default function (nodes, config) {
.neighbourSize(neighbourSize)
.sampleSize(sampleSize)
.distanceRange(distanceRange)
.distance(distance)
.multiplier(MULTIPLIER)
.distance(distanceFn)
)
.alpha(1).restart();
@@ -66,8 +64,7 @@ export default function (nodes, config) {
.neighbourSize(FullneighbourSize)
.sampleSize(FullsampleSize)
.distanceRange(FulldistanceRange)
.distance(distance)
.multiplier(MULTIPLIER)
.distance(distanceFn)
)
.on("tick", function () {
event.call("fullTick", fullSimulation);