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

Pivot cache number of pivots to a variable

Browse Source
This commit is contained in:
Pitchaya Boonsarngsuk
2018-01-31 16:04:48 +00:00
parent 0b0cd6d545
commit 28c27df551
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/interpolation/interpolationPivots.js
View File

@@ -25,6 +25,7 @@ import {placeNearToNearestNeighbour} from "./interpCommon";
export default function(sampleSet, remainderSet, numPivots, distanceFn, endingIts) { export default function(sampleSet, remainderSet, numPivots, distanceFn, endingIts) {
// Pivot based parent finding // Pivot based parent finding
let numBuckets = Math.floor(Math.sqrt(sampleSet.length)); let numBuckets = Math.floor(Math.sqrt(sampleSet.length));
let numNonPivots = sampleSet.length - numPivots;
let sets = takeSampleFrom(sampleSet, numPivots); let sets = takeSampleFrom(sampleSet, numPivots);
let pivots = sets.sample; let pivots = sets.sample;
let nonPivotSamples = sets.remainder; let nonPivotSamples = sets.remainder;
@@ -49,7 +50,7 @@ export default function(sampleSet, remainderSet, numPivots, distanceFn, endingIt
let pivot = pivots[j]; let pivot = pivots[j];
let maxDist = -1; let maxDist = -1;
for (let i = 0; i < nonPivotSamples.length; i++) { for (let i = 0; i < numNonPivots; i++) {
let sample = nonPivotSamples[i]; let sample = nonPivotSamples[i];
distCache[i][j] = distanceFn(pivot, sample); distCache[i][j] = distanceFn(pivot, sample);
if (distCache[i][j] > maxDist) if (distCache[i][j] > maxDist)
@@ -62,7 +63,7 @@ export default function(sampleSet, remainderSet, numPivots, distanceFn, endingIt
// Put samples (pivot not included) into buckets // Put samples (pivot not included) into buckets
for (let j = 0; j < numPivots; j++) { for (let j = 0; j < numPivots; j++) {
let bucketWidth = bucketWidths[j]; let bucketWidth = bucketWidths[j];
for (let i = 0; i < nonPivotSamples.length; i++) { for (let i = 0; i < numNonPivots; i++) {
let sample = nonPivotSamples[i]; let sample = nonPivotSamples[i];
let bucketNumber = Math.floor(distCache[i][j] / bucketWidth); let bucketNumber = Math.floor(distCache[i][j] / bucketWidth);
if (bucketNumber >= numBuckets) { if (bucketNumber >= numBuckets) {