From 7b6b5e46c6e7acd1499cadf6efa334afe59e0dad Mon Sep 17 00:00:00 2001
From: Pitchaya Boonsarngsuk <2285135b@student.gla.ac.uk>
Date: Tue, 16 Jan 2018 21:24:47 +0000
Subject: [PATCH] Interp almost-complete brute-force interpolation

---
 ...3-force-neighbourSampling-papaparsing.html |   2 +-
 .../js/src/neighbourSampling-papaparsing.js   |  23 ++--
 src/hybridSimulation.js                       |  33 ++---
 src/interpolation.js                          | 118 +++++++-----------
 4 files changed, 82 insertions(+), 94 deletions(-)

diff --git a/examples/d3-force-neighbourSampling-papaparsing.html b/examples/d3-force-neighbourSampling-papaparsing.html
index c574844..a6b172c 100644
--- a/examples/d3-force-neighbourSampling-papaparsing.html
+++ b/examples/d3-force-neighbourSampling-papaparsing.html
@@ -166,7 +166,7 @@
           <label title="Number of iterations done at the end">
             Full: Iterations
             <output id="fullIterationsSliderOutput">20</output><br/>
-            <input type="range" min="1" max="100" value="20" step="1" oninput="d3.select('#fullIterationsSliderOutput').text(value); FULL_ITERATIONS=value;">
+            <input type="range" min="0" max="100" value="20" step="1" oninput="d3.select('#fullIterationsSliderOutput').text(value); FULL_ITERATIONS=value;">
             </label>
           <br/>
           <label title="Full NeighbourSize">
diff --git a/examples/js/src/neighbourSampling-papaparsing.js b/examples/js/src/neighbourSampling-papaparsing.js
index 5e6d20e..64e7307 100644
--- a/examples/js/src/neighbourSampling-papaparsing.js
+++ b/examples/js/src/neighbourSampling-papaparsing.js
@@ -297,16 +297,21 @@ function startHybridSimulation() {
   simulation.stop();
   p1 = performance.now();
 
-  hybridSimulation = d3.hybridSimulation(nodes);
-
-  hybridSimulation
-    .multiplier(MULTIPLIER)
-    .sampleIterations(ITERATIONS)
-    .pivots(PIVOTS)
-    .numPivots(NUM_PIVOTS)
-    .fullIterations(FULL_ITERATIONS)
-    .neighbourSize(NEIGHBOUR_SIZE)
+  configuration = {
+    iteration: ITERATIONS,
+    neighbourSize: NEIGHBOUR_SIZE,
+    sampleSize: SAMPLE_SIZE,
+    distanceRange: SELECTED_DISTANCE * MULTIPLIER,
+    fullIterations: FULL_ITERATIONS,
+    fullNeighbourSize: FULL_NEIGHBOUR_SIZE,
+    fullSampleSize: FULL_SAMPLE_SIZE,
+    fullDistanceRange: FULL_SELECTED_DISTANCE * MULTIPLIER,
+    distanceFn: function (s, t) {return distanceFunction(s, t, props, norm) * MULTIPLIER;},
+    pivots: PIVOTS,
+    numPivots: NUM_PIVOTS
+  };
     .sampleSize(SAMPLE_SIZE);
+  hybridSimulation = d3.hybridSimulation(nodes, configuration);
 
   let sample = hybridSimulation.sample();
   let remainder = hybridSimulation.remainder();
diff --git a/src/hybridSimulation.js b/src/hybridSimulation.js
index bb98ed0..c966834 100644
--- a/src/hybridSimulation.js
+++ b/src/hybridSimulation.js
@@ -16,34 +16,34 @@ 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,
-    distanceFn = config.hasOwnProperty("distanceFn") ? config.distance : constant(300),
+    distanceFn = config.hasOwnProperty("distanceFn") ? config.distanceFn : constant(300),
     PIVOTS = config.hasOwnProperty("pivots") ? config.pivots : false,
     NUMPIVOTS = config.hasOwnProperty("numPivots") ? config.numPivots : 3,
     event = d3.dispatch("sampleTick", "fullTick", "startFull", "end");
 
-  var sets = sampleFromNodes(nodes, nodes.length, Math.sqrt(nodes.length));
+  var sets = sampleFromNodes(nodes, Math.sqrt(nodes.length));
   var sample = sets.sample;
   var remainder = sets.remainder;
-  var interpSubset = sampleFromNodes(sample, sample.length, Math.sqrt(sample.length)).sample;
+  var sampleSubset = sampleFromNodes(sample, Math.sqrt(sample.length)).sample;
 
   var sampleSimulation = d3.forceSimulation(sample)
     .stop()
-    .alphaDecay(1 - Math.pow(0.001, 1 / SAMPLE_ITERATIONS));
-
-  sampleSimulation
+    .alphaDecay(1 - Math.pow(0.001, 1 / SAMPLE_ITERATIONS))
     .on("tick", function () {
       event.call("sampleTick", sampleSimulation);
     })
-    .on("end", ended)
-    .force("neighbourSampling", neighbourSamplingDistance()
+    .on("end", ended);
+
+  sampleSimulation.force("forces", neighbourSamplingDistance()
       .neighbourSize(neighbourSize)
       .sampleSize(sampleSize)
       .distanceRange(distanceRange)
       .distance(distanceFn)
-      )
-    .alpha(1).restart();
+    );
+  sampleSimulation.alpha(1).restart();
 
   function ended() {
+    event.call("startFull");
     console.log("Ended sample simulation");
     /*
     if (PIVOTS) {
@@ -52,12 +52,16 @@ export default function (nodes, config) {
       interpolation(sample, remainder, interpSubset, distance);
     }
     */
-    if (FULL_ITERATIONS==0) return;
+    event.call("fullTick");
+    alert('About to Full run');
+    if (FULL_ITERATIONS==0) {
+      event.call("end");
+      return;
+    }
     fullSimulation = d3.forceSimulation()
       .stop()
       .alphaDecay(1 - Math.pow(0.001, 1 / FULL_ITERATIONS));
 
-    event.call("startFull", fullSimulation);
 
     fullSimulation
       .force("neighbourSampling", neighbourSamplingDistance()
@@ -139,8 +143,9 @@ export default function (nodes, config) {
 }
 
 
-function sampleFromNodes(nodes, max, size) {
-  var randElements = [];
+function sampleFromNodes(nodes, size) {
+  let randElements = [],
+      max = nodes.length;
 
   for (var i = 0; i < size; ++i) {
     var rand = nodes[Math.floor((Math.random() * max))];
diff --git a/src/interpolation.js b/src/interpolation.js
index a4e13a1..7989eb6 100644
--- a/src/interpolation.js
+++ b/src/interpolation.js
@@ -1,60 +1,45 @@
-export default function(sampleSet, remainderSet, interpSubset, distanceFunction) {
+export default function(sampleSet, remainderSet, sampleSubset, distanceFn) {
   var distance = distanceFunction;
   // var distance = calculateEuclideanDistance;
-
   // console.log("Brute-force");
+  for (let node of remainderSet) {
+    let nearestSample = undefined,
+        minDist = undefined,
+        sampleSubsetDistanceCache = [];
 
-  for (var i = 0; i < remainderSet.length; i++) {
-    var node = remainderSet[i],
-      minNode = sampleSet[0],
-      minDist = 0,
-      sampleCache = [];
+    for (let sample of sampleSet) {
+      let dist = distanceFn(node, sample);
+      if (nearestSample === undefined || dist < minDist) {
+        minDist = dist;
+        nearestSample = sample;
+      }
 
-    minDist = distance(node, minNode, props, norm);
-
-    for (var j = 1, sample; j < sampleSet.length; j++) {
-      sample = sampleSet[j];
-      if ((sample !== node) && (distance(node, sample, props, norm) < minDist)) {
-        minDist = distance(node, sample, props, norm);
-        minNode = sample;
+      let index = sampleSubset.indexOf(sample);
+      if (index !== -1) {
+        sampleSubsetDistanceCache[index] = dist;
       }
     }
 
-    // console.log()
-
-    for (var k = 0; k < interpSubset.length; k++) {
-      sampleCache[k] = distance(node, interpSubset[k], props, norm);
-    }
-    var radius = distance(node, minNode, props, norm);
-    placeNearToNearestNeighbour(node, minNode, interpSubset, sampleCache, radius);
+    placeNearToNearestNeighbour(node, nearestSample, minDist, sampleSubset, sampleSubsetDistanceCache);
   }
 }
 
 
-function placeNearToNearestNeighbour(node, minNode, sample, sampleCache, radius) {
-  var
-    dist0 = 0.0,
-    dist90 = 0.0,
-    dist180 = 0.0,
-    dist270 = 0.0,
+function placeNearToNearestNeighbour(node, minNode, radius, samples, realDistances) {
+  let
+    dist0 = sumDistError(pointOnCircle(minNode.x, minNode.y, 0, radius), samples, realDistances),
+    dist90 = sumDistError(pointOnCircle(minNode.x, minNode.y, 90, radius), samples, realDistances),
+    dist180 = sumDistError(pointOnCircle(minNode.x, minNode.y, 180, radius), samples, realDistances),
+    dist270 = sumDistError(pointOnCircle(minNode.x, minNode.y, 270, radius), samples, realDistances),
     lowBound = 0.0,
     highBound = 0.0;
 
-  dist0 = sumDistToSample(node, centerPoint(0, radius, minNode.x, minNode.y), sample, sampleCache);
-  dist90 = sumDistToSample(node, centerPoint(90, radius, minNode.x, minNode.y), sample, sampleCache);
-  dist180 = sumDistToSample(node, centerPoint(180, radius, minNode.x, minNode.y), sample, sampleCache);
-  dist270 = sumDistToSample(node, centerPoint(270, radius, minNode.x, minNode.y), sample, sampleCache);
-
-  // console.log(dist0, dist90, dist180, dist270);
-
   // Determine the closest quadrant
-
   if (dist0 == dist180) {
     if (dist90 > dist270)
       lowBound = highBound = 270;
     else
       lowBound = highBound = 90;
-
   } else if (dist90 == dist270) {
     if (dist0 > dist180)
       lowBound = highBound = 180;
@@ -78,8 +63,11 @@ function placeNearToNearestNeighbour(node, minNode, sample, sampleCache, radius)
     }
   }
 
-  let angle = binarySearch(lowBound, highBound, minNode.x, minNode.y, radius, node, sample, realDistances);
-  let newPoint = centerPoint(angle, radius, minNode.x, minNode.y);
+  let angle = binarySearchMin(lowBound, highBound,
+                             function(angle){
+                               return sumDistError(pointOnCircle(minNode.x, minNode.y, angle, radius), samples, realDistances);
+                             });
+  let newPoint = pointOnCircle(minNode.x, minNode.y, angle, radius);
 
   // console.log(newPoint);
   node.x = newPoint.x;
@@ -110,17 +98,13 @@ function toRadians(degrees) {
   return degrees * (Math.PI / 180);
 }
 
-function sumDistToSample(node, point, sample, sampleCache) {
-  var total = 0.0;
-  // console.log(total, sample);
-
-  for (var i = 0; i < sample.length; i++) {
-    var s = sample[i];
-    var realDist = Math.hypot(s.x - point.x, s.y - point.y);
-    var desDist = sampleCache[i];
-    total += Math.abs(realDist - desDist);
+function sumDistError(currentPos, samples, realDistances) {
+  let total = 0.0;
+  for (let i = 0; i < samples.length; i++) {
+    let sample = samples[i];
+    let lowDDistance = Math.hypot(sample.x - currentPos.x, sample.y - currentPos.y);
+    total += Math.abs(lowDDistance - realDistances[i]);
   }
-
   return total;
 }
 
@@ -165,32 +149,26 @@ function sumForcesToSample(node, sample, sampleCache) {
   }
 }
 
-
-function binarySearch(lb, hb, x, y, r, node, sample, sampleCache) {
+function binarySearchMin(lb, hb, fn) {
   while (lb <= hb) {
-    var mid = Math.round((lb + hb) / 2);
+    if(lb === hb) return lb;
+    if(hb-lb == 1) {
+      if (fn(lb) >= fn(hb)) return hb;
+      else return lb;
+    }
 
-    if ((mid === lb) || (mid === hb)) {
-      if (sumDistToSample(node, centerPoint(lb, r, x, y), sample, sampleCache) >=
-        sumDistToSample(node, centerPoint(hb, r, x, y), sample, sampleCache)) {
-        return hb;
-      } else {
-        return lb;
-      }
-    } else {
-      var distMidLeft = sumDistToSample(node, centerPoint(mid + 1, r, x, y), sample, sampleCache);
-      var distMidRight = sumDistToSample(node, centerPoint(mid - 1, r, x, y), sample, sampleCache);
-      var distMid = sumDistToSample(node, centerPoint(mid, r, x, y), sample, sampleCache);
+    let range = hb-lb;
+    let valLowerHalf = fn(lb + range/4);
+    let valHigherHalf = fn(lb + range*3/4);
 
-      if (distMid > distMidLeft) {
-        lb = mid + 1;
-      } else if (distMid > distMidRight) {
-        hb = mid - 1;
-      } else {
-        return mid;
-      }
+    if (valLowerHalf > valHigherHalf)
+      lb = Math.floor((lb + hb) / 2);
+    else if (valLowerHalf < valHigherHalf)
+      hb = Math.ceil((lb + hb) / 2);
+    else {
+      lb += Math.floor(range/4);
+      hb -= Math.ceil(range/4);
     }
   }
-
   return -1;
 }