From 0fe075d4bad8a09cde55aca67fa1bc719174a90a Mon Sep 17 00:00:00 2001
From: Pitchaya Boonsarngsuk <2285135b@student.gla.ac.uk>
Date: Fri, 2 Feb 2018 10:16:27 +0000
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B9=80=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=95=E0=B9=89=E0=B8=99=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AB=E0=B8=A3=E0=B8=B1=E0=B8=9A=20neighbour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...3-force-neighbourSampling-papaparsing.html | 24 +++++++++----------
 .../js/src/neighbourSampling-papaparsing.js   |  8 +++----
 .../neighbourSampling-papaparsing/hybrid.js   |  4 ++--
 src/neighbourSamplingDistance.js              |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/examples/d3-force-neighbourSampling-papaparsing.html b/examples/d3-force-neighbourSampling-papaparsing.html
index 12bfbe9..9229059 100644
--- a/examples/d3-force-neighbourSampling-papaparsing.html
+++ b/examples/d3-force-neighbourSampling-papaparsing.html
@@ -147,14 +147,14 @@
           <br/>
           <label title="NeighbourSize">
             Subset: Neighbour Set
-            <output id="hlneighbourSizeSliderOutput">6</output><br/>
-            <input type="range" min="1" max="100" value="6" step="1" oninput="d3.select('#hlneighbourSizeSliderOutput').text(value); NEIGHBOUR_SIZE=value;">
+            <output id="hlneighbourSizeSliderOutput">10</output><br/>
+            <input type="range" min="1" max="100" value="10" step="1" oninput="d3.select('#hlneighbourSizeSliderOutput').text(value); NEIGHBOUR_SIZE=value;">
             </label>
           <br/>
           <label title="SampleSize">
             Subset: Sample Set
-            <output id="hlsampleSizeSliderOutput">3</output><br/>
-            <input type="range" min="1" max="100" value="3" step="1" oninput="d3.select('#hlsampleSizeSliderOutput').text(value); SAMPLE_SIZE=value;">
+            <output id="hlsampleSizeSliderOutput">10</output><br/>
+            <input type="range" min="1" max="100" value="10" step="1" oninput="d3.select('#hlsampleSizeSliderOutput').text(value); SAMPLE_SIZE=value;">
             </label>
           <br/>
           <label title="InterpEndingIts">
@@ -171,14 +171,14 @@
           <br/>
           <label title="Full NeighbourSize">
             Full: Neighbour Set
-            <output id="hlFullneighbourSizeSliderOutput">6</output><br/>
-            <input type="range" min="1" max="100" value="6" step="1" oninput="d3.select('#hlFullneighbourSizeSliderOutput').text(value); FULL_NEIGHBOUR_SIZE=value;">
+            <output id="hlFullneighbourSizeSliderOutput">10</output><br/>
+            <input type="range" min="1" max="100" value="10" step="1" oninput="d3.select('#hlFullneighbourSizeSliderOutput').text(value); FULL_NEIGHBOUR_SIZE=value;">
             </label>
           <br/>
           <label title="Full SampleSize">
             Full: Sample Set
-            <output id="hlFullsampleSizeSliderOutput">3</output><br/>
-            <input type="range" min="1" max="100" value="3" step="1" oninput="d3.select('#hlFullsampleSizeSliderOutput').text(value); FULL_SAMPLE_SIZE=value;">
+            <output id="hlFullsampleSizeSliderOutput">10</output><br/>
+            <input type="range" min="1" max="100" value="10" step="1" oninput="d3.select('#hlFullsampleSizeSliderOutput').text(value); FULL_SAMPLE_SIZE=value;">
             </label>
         </div>
 
@@ -187,14 +187,14 @@
         <div id="NSParameters" class="parameters" style="display:none">
           <label title="NeighbourSize">
             Neighbour Set
-            <output id="neighbourSizeSliderOutput">6</output><br/>
-            <input type="range" min="1" max="100" value="6" step="1" oninput="d3.select('#neighbourSizeSliderOutput').text(value); NEIGHBOUR_SIZE=value;">
+            <output id="neighbourSizeSliderOutput">10</output><br/>
+            <input type="range" min="1" max="100" value="10" step="1" oninput="d3.select('#neighbourSizeSliderOutput').text(value); NEIGHBOUR_SIZE=value;">
             </label>
           <br/>
           <label title="SampleSize">
             Sample Set
-            <output id="sampleSizeSliderOutput">3</output><br/>
-            <input type="range" min="1" max="100" value="3" step="1" oninput="d3.select('#sampleSizeSliderOutput').text(value); SAMPLE_SIZE=value;">
+            <output id="sampleSizeSliderOutput">10</output><br/>
+            <input type="range" min="1" max="100" value="10" step="1" oninput="d3.select('#sampleSizeSliderOutput').text(value); SAMPLE_SIZE=value;">
             </label>
         </div>
         <input class="noParameters" type="radio" name="algorithm" onclick="d3.select('#startSimulation').on('click', startLinkSimulation); tweakedVerOfLink=false;">Link force in D3<br>
diff --git a/examples/js/src/neighbourSampling-papaparsing.js b/examples/js/src/neighbourSampling-papaparsing.js
index ae3029a..a94b26e 100644
--- a/examples/js/src/neighbourSampling-papaparsing.js
+++ b/examples/js/src/neighbourSampling-papaparsing.js
@@ -50,16 +50,16 @@ var nodes, // as in Data points
 var MULTIPLIER = 50,
   PERPLEXITY = 30,
   LEARNING_RATE = 10,
-  NEIGHBOUR_SIZE = 6,
-  SAMPLE_SIZE = 3,
+  NEIGHBOUR_SIZE = 10,
+  SAMPLE_SIZE = 10,
   PIVOTS = false,
   NUM_PIVOTS = 3,
   ITERATIONS = 300,
   FULL_ITERATIONS = 20,
   NODE_SIZE = 10,
   COLOR_ATTRIBUTE = "",
-  FULL_NEIGHBOUR_SIZE = 6,
-  FULL_SAMPLE_SIZE = 3,
+  FULL_NEIGHBOUR_SIZE = 10,
+  FULL_SAMPLE_SIZE = 10,
   INTERP_ENDING_ITS = 20;
 
 // Create a color scheme for a range of numbers.
diff --git a/examples/js/src/neighbourSampling-papaparsing/hybrid.js b/examples/js/src/neighbourSampling-papaparsing/hybrid.js
index 89b0ab4..551ae1f 100644
--- a/examples/js/src/neighbourSampling-papaparsing/hybrid.js
+++ b/examples/js/src/neighbourSampling-papaparsing/hybrid.js
@@ -13,12 +13,12 @@ function startHybridSimulation() {
     return distanceFunction(s, t, props, norm);
   }
 
-  let forceSample = d3.forceNeighbourSamplingDistance()
+  let forceSample = d3.forceNeighbourSampling()
     .neighbourSize(NEIGHBOUR_SIZE)
     .sampleSize(SAMPLE_SIZE)
     .distance(distance)
 
-  let forceFull = d3.forceNeighbourSamplingDistance()
+  let forceFull = d3.forceNeighbourSampling()
     .neighbourSize(FULL_NEIGHBOUR_SIZE)
     .sampleSize(FULL_SAMPLE_SIZE)
     .distance(distance)
diff --git a/src/neighbourSamplingDistance.js b/src/neighbourSamplingDistance.js
index 691f945..a672052 100644
--- a/src/neighbourSamplingDistance.js
+++ b/src/neighbourSamplingDistance.js
@@ -16,8 +16,8 @@ export default function () {
   var neighbours = [],
     distance = constant(300),
     nodes,
-    neighbourSize = 6,
-    sampleSize = 3,
+    neighbourSize = 10,
+    sampleSize = 10,
     stableVelocity = 0,
     stableVeloHandler = null,
     dataSizeFactor;