Merge branch 'master' into bulletbullet

3 files changed, 11 insertions, 8 deletions

diff --git a/tools/claim.js b/tools/claim.js
index b43417b..5989a8c 100644
--- a/tools/claim.js
+++ b/tools/claim.js
@@ -25,9 +25,9 @@ module.exports = function(){
   this.handle = function(send, tilespaces, locs){
     // Because usually tilespaces is small, the inefficiency of an O(nk) rect match is acceptable
     for (let id in claims){
-      claim = claims[id];
-      diffspace = {};
-      rellocs = [];
+      let claim = claims[id];
+      let diffspace = {};
+      let rellocs = [];
       for (let loc of locs){
         let tile = tilespaces[loc];
         if (ri(claim.area, [vec.tileToChar(loc), vec.tileToChar(vec.add(loc, [1,1]))])){
diff --git a/tools/schedule.js b/tools/schedule.js
index d8509b8..c110bb3 100644
--- a/tools/schedule.js
+++ b/tools/schedule.js
@@ -86,14 +86,17 @@ exports.Queue = function(delayms, maxExport, call){
 
     // Step 2: Start at lowest, and pop all until job.data.length>job.normweight*num (decreasing num as popping and recalc job.normweight). Delete the job. 
     let weightsum = jobq.map(job => job.wt).reduce((acc, cur)=>acc+cur);
-    while (jobq[0] && jobq[0].data.length<(jobq[0].wacc+jobq[0].wt*num/weightsum)){
-      weightsum -= jobq[0].wt;
+    while (jobq[0] && jobq[0].data.length<(jobq[0].wt*num/weightsum)){
+      // The second req is SO weird. Think about it this way: for len objs
+      // to be pushed, the "odds" of the job getting a push must >= len (pushed
+      // len times). But it gets num tries, so the odds*num >= len.
+      // The odds are wt/wtsum for each try.
       dequeued.push(...jobq.shift().data);
     }
 
     // Step 3: Then, pop job.normweight*num//1 elems from remaining, without num decrease or normweight recalc. But keep job.wacc = job.normweight*num%1
     let efflen = num - dequeued.length;
-    for (job of jobq){
+    for (let job of jobq){
       let topop = job.wt*efflen/weightsum;
       job.wacc += topop%1;
       topop = topop-topop%1;
@@ -102,7 +105,7 @@ exports.Queue = function(delayms, maxExport, call){
     }
 
     // Step 4: Shallow copy job array, and sort by job.wacc.
-    for (job of jobq.slice().sort((el, ne) => el.wacc-ne.wacc)){
+    for (let job of jobq.slice().sort((el, ne) => el.wacc-ne.wacc)){
       // Step 5: Iterate through array (high->low), and subtract 1 until the length of output is num.
       if (dequeued.length == num || job.data.length == 0) break;
       job.wacc--;
diff --git a/tools/search.js b/tools/search.js
index 78e0ee7..e365214 100644
--- a/tools/search.js
+++ b/tools/search.js
@@ -78,7 +78,7 @@ function Search(){ // searchBlock should be a Space object.
 
   this.update = function(space){ // Must be a space w/ valid loc; allows overlay of some arbitrary text (in the space) mostly for recording updates from the server without directly cataloguing them
     let tiles = raster(space); // Returns a this.tiles-style binding: {'2,-3':Space object}
-    for (tile in tiles){
+    for (let tile in tiles){
       if (this.tiles[tile]) this.tiles[tile].comb(tiles[tile], comb.flip(comb.add));
       else this.add(tile, tiles[tile]);
     }