แก้ coding style ภาค 5

This commit is contained in:
Pitchaya Boonsarngsuk
2018-03-22 16:29:10 +00:00
parent 8e34697d89
commit 21ee710468
5 changed files with 26 additions and 26 deletions

View File

@@ -9,6 +9,7 @@ rules:
semi:
- error
- always
no-return-assign: 0
/*
no-extra-parens: 1
curly: 0

View File

@@ -67,13 +67,14 @@ export default function (sim, forceS, forceF) {
}
// Set default value for interpDistanceFn if not been specified yet
if(interpDistanceFn === undefined) {
if(forceFull.distance == 'function')
if (interpDistanceFn === undefined) {
if (forceFull.distance == 'function') {
interpDistanceFn = forceFull.distance();
else
} else {
interpDistanceFn = constant(300);
}
}
}
function initSimulation () {
nodes = simulation.nodes();

View File

@@ -39,8 +39,7 @@ export default function (sampleSet, remainderSet, distanceFn, endingIts) {
}
index = sampleSubset.indexOf(sample);
if (index !== -1)
sampleSubsetDistanceCache[index] = dist;
if (index !== -1) { sampleSubsetDistanceCache[index] = dist; }
}
placeNearToNearestNeighbour(node, nearestSample, minDist, sampleSubset, sampleSubsetDistanceCache, endingIts);

View File

@@ -38,15 +38,11 @@ export function placeNearToNearestNeighbour (node, nearNeighbour, radius, sample
// Determine the closest quadrant
if (dist0 == dist180) {
if (dist90 > dist270)
lowBound = highBound = 270;
else
lowBound = highBound = 90;
if (dist90 > dist270) { lowBound = highBound = 270; }
else { lowBound = highBound = 90; }
} else if (dist90 == dist270) {
if (dist0 > dist180)
lowBound = highBound = 180;
else
lowBound = highBound = 0;
if (dist0 > dist180) { lowBound = highBound = 180; }
else { lowBound = highBound = 0; }
} else if (dist0 > dist180) {
if (dist90 > dist270) {
lowBound = 180;
@@ -122,13 +118,14 @@ function binarySearchMin (lb, hb, fn) {
valLowerHalf = fn(lb + range / 4),
valHigherHalf = fn(lb + range * 3 / 4);
if (valLowerHalf > valHigherHalf)
if (valLowerHalf > valHigherHalf) {
lb = Math.floor((lb + hb) / 2);
else if (valLowerHalf < valHigherHalf)
}
else if (valLowerHalf < valHigherHalf) {
hb = Math.ceil((lb + hb) / 2);
else {
lb += Math.floor(range/4);
hb -= Math.ceil(range/4);
} else {
lb += Math.floor(range / 4);
hb -= Math.ceil(range / 4);
}
}
return -1;

View File

@@ -44,8 +44,9 @@ export default function (sampleSet, remainderSet, numPivots, distanceFn, endingI
let distCache = []; // [ For each non-pivot sample:[For each Pivot: distance] ]
let bucketWidths = []; // [ For each Pivot: width of each bucket ]
for (let i = 0; i < nonPivotSamples.length; i++)
for (let i = 0; i < nonPivotSamples.length; i++) {
distCache[i] = [];
}
for (let j = 0; j < numPivots; j++) {
let pivot = pivots[j];
@@ -54,9 +55,10 @@ export default function (sampleSet, remainderSet, numPivots, distanceFn, endingI
for (let i = 0; i < numNonPivots; i++) {
let sample = nonPivotSamples[i];
distCache[i][j] = distanceFn(pivot, sample);
if (distCache[i][j] > maxDist)
if (distCache[i][j] > maxDist) {
maxDist = distCache[i][j];
}
}
bucketWidths.push(maxDist / numBuckets);
}
@@ -109,12 +111,11 @@ export default function (sampleSet, remainderSet, numPivots, distanceFn, endingI
for (let j = pivotsBuckets[p][bucketNumber].length - 1; j >= 0; j--) {
let candidateNode = pivotsBuckets[p][bucketNumber][j];
let index = sampleSubset.indexOf(candidateNode);
if (index !== -1 && sampleSubsetDistanceCache[index] !== undefined)
dist = sampleSubsetDistanceCache[index]
else {
if (index !== -1 && sampleSubsetDistanceCache[index] !== undefined) {
dist = sampleSubsetDistanceCache[index];
} else {
dist = distanceFn(candidateNode, node);
if (index !== -1)
sampleSubsetDistanceCache[index] = dist;
if (index !== -1) { sampleSubsetDistanceCache[index] = dist; }
}
if (dist < minDist) {
@@ -126,9 +127,10 @@ export default function (sampleSet, remainderSet, numPivots, distanceFn, endingI
// Fill in holes in cache
for (let k = 0; k < sampleSubset.length; k++) {
if (sampleSubsetDistanceCache[k] === undefined)
if (sampleSubsetDistanceCache[k] === undefined) {
sampleSubsetDistanceCache[k] = distanceFn(node, sampleSubset[k]);
}
}
placeNearToNearestNeighbour(node, nearSample, minDist, sampleSubset, sampleSubsetDistanceCache, endingIts);
}
}