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

Fix incomplete commits

Browse Source
This commit is contained in:
Pitchaya Boonsarngsuk
2018-01-17 10:07:39 +00:00
parent 802402d413
commit 1d711f828d
5 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/d3-force-neighbourSampling-papaparsing.html
View File

@@ -312,4 +312,4 @@
</script> </script>
</html> </html>

16
examples/js/src/neighbourSampling-papaparsing.js
View File

@@ -354,23 +354,11 @@ function startHybridSimulation() {
hybridSimulation hybridSimulation
.on("sampleTick", tickedHybrid) .on("sampleTick", ticked)
.on("fullTick", tickedHybrid) .on("fullTick", ticked)
.on("startFull", startedFull) .on("startFull", startedFull)
.on("end", endedHybrid); .on("end", endedHybrid);
function tickedHybrid() {
if (rendering === true) {
node
.attr("cx", function (d) {
return d.x;
})
.attr("cy", function (d) {
return d.y;
});
}
}
function startedFull() { function startedFull() {
d3.selectAll(".nodes").remove(); d3.selectAll(".nodes").remove();
// Add the nodes to DOM. // Add the nodes to DOM.

8
src/hybridSimulation.js
View File

@@ -48,11 +48,13 @@ export default function (nodes, config) {
function ended() { function ended() {
event.call("startFull"); event.call("startFull");
console.log("Ended sample simulation"); console.log("Ended sample simulation");
alert('About to interpolate');
interpolation(sample, remainder, sampleSubset, distanceFn);
/* /*
if (PIVOTS) { if (PIVOTS) {
interpolationPivots(sample, remainder, interpSubset, NUMPIVOTS, distance); interpolationPivots(sample, remainder, sampleSubSet, NUMPIVOTS, distance);
} else { } else {
interpolation(sample, remainder, interpSubset, distance); interpolation(sample, remainder, sampleSubSet, distance);
} }
*/ */
event.call("fullTick"); event.call("fullTick");
@@ -72,6 +74,8 @@ export default function (nodes, config) {
.sampleSize(FullsampleSize) .sampleSize(FullsampleSize)
.distanceRange(FulldistanceRange) .distanceRange(FulldistanceRange)
.distance(distanceFn) .distance(distanceFn)
.stableVelocity(60)
.stableVeloHandler(function(){fullSimulation.stop(); event.call("end");})
) )
.on("tick", function () { .on("tick", function () {
event.call("fullTick", fullSimulation); event.call("fullTick", fullSimulation);

2
src/interpolation.js
View File

@@ -64,7 +64,7 @@ function placeNearToNearestNeighbour(node, minNode, radius, sampleSubset, realDi
let angle = binarySearchMin(lowBound, highBound, let angle = binarySearchMin(lowBound, highBound,
function(angle){ function(angle){
return sumDistError(pointOnCircle(minNode.x, minNode.y, angle, radius), samples, realDistances); return sumDistError(pointOnCircle(minNode.x, minNode.y, angle, radius), sampleSubset, realDistances);
}); });
let newPoint = pointOnCircle(minNode.x, minNode.y, angle, radius); let newPoint = pointOnCircle(minNode.x, minNode.y, angle, radius);

2
src/neighbourSamplingDistance.js
View File

@@ -57,7 +57,7 @@ export default function () {
findNewNeighbours(i); findNewNeighbours(i);
} }
velocity /= nodes.length*alpha; velocity /= nodes.length*alpha;
// Now total velocity change per node, alpha not considered // Now total velocity changes per node, alpha not considered
if(Math.abs(velocity)<stableVelocity && stableVeloHandler!== null){ if(Math.abs(velocity)<stableVelocity && stableVeloHandler!== null){
console.log("Neighbour sampling is now", velocity, ", calling stableVeloHandler().") console.log("Neighbour sampling is now", velocity, ", calling stableVeloHandler().")
stableVeloHandler(); stableVeloHandler();