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

InterpCommon Extract function

Browse Source
This commit is contained in:
Pitchaya Boonsarngsuk
2018-02-02 13:26:20 +00:00
parent 636779322b
commit 92f9b83f28
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/interpolation/interpCommon.js
View File

@@ -26,10 +26,13 @@ import jiggle from "../jiggle";
*/
export function placeNearToNearestNeighbour(node, nearNeighbour, radius, sampleSubset, realDistances, endingIts) {
let
dist0 = sumDistError(pointOnCircle(nearNeighbour.x, nearNeighbour.y, 0, radius), sampleSubset, realDistances),
dist90 = sumDistError(pointOnCircle(nearNeighbour.x, nearNeighbour.y, 90, radius), sampleSubset, realDistances),
dist180 = sumDistError(pointOnCircle(nearNeighbour.x, nearNeighbour.y, 180, radius), sampleSubset, realDistances),
dist270 = sumDistError(pointOnCircle(nearNeighbour.x, nearNeighbour.y, 270, radius), sampleSubset, realDistances),
sumDistErrorByAngle = function(angle){
return sumDistError(pointOnCircle(nearNeighbour.x, nearNeighbour.y, angle, radius), sampleSubset, realDistances);
})
dist0 = sumDistErrorByAngle(0),
dist90 = sumDistErrorByAngle(90),
dist180 = sumDistErrorByAngle(180),
dist270 = sumDistErrorByAngle(270),
lowBound = 0.0,
highBound = 0.0;
@@ -63,10 +66,7 @@ export function placeNearToNearestNeighbour(node, nearNeighbour, radius, sampleS
}
// Determine the angle
let angle = binarySearchMin(lowBound, highBound,
function(angle){
return sumDistError(pointOnCircle(nearNeighbour.x, nearNeighbour.y, angle, radius), sampleSubset, realDistances);
});
let angle = binarySearchMin(lowBound, highBound,sumDistErrorByAngle);
let newPoint = pointOnCircle(nearNeighbour.x, nearNeighbour.y, angle, radius);
node.x = newPoint.x;
node.y = newPoint.y;