Added fast average for optimized time savings

Author: alpharou

controller.js

@@ -53,24 +53,26 @@ class Controller {
 		if (this.data.length == 0) {return "No data set";}
 
 		//Create initial task
-		//this.setPivot();
+		this.initPivots();
 		this.query(this.data.length, 0, this.data.length - 1);
 
 		this.controllerStatus = "WORK";
 		return true;
 
 	}
 
-	setPivot() {
+	initPivots() {
 
 		let minValue = this.data[0];
 		let minIndex = 0;
+		let maxValue = this.data[0];
+		let maxIndex = 0;
 
 		for (let i = 0; i < this.data.length; i++) {
 
-			if (abs(this.data[i] - this.pivAvg) < minValue) {
+			if (this.data[i] <= minValue) {
 
-				minValue = abs(this.data[i] - this.pivAvg);
+				minValue = this.data[i];
 				minIndex = i;
 
 			}
@@ -79,6 +81,20 @@ class Controller {
 
 		this.swap(0, minIndex);
 
+		for (let i = 0; i < this.data.length; i++) {
+			
+			if (this.data[i] >= maxValue) {
+				
+				maxValue = this.data[i];
+				maxIndex = i;
+				
+			}
+			
+		}
+		
+		this.swap(this.data.length - 1, maxIndex);
+		return true;
+		
 	}
 
 	assignQuery() {
@@ -151,7 +167,7 @@ class Controller {
 
 		this.data.push(data);
 
-		this.pivAvg = Math.round(this.pivAvg * ((this.data.length-1)/this.data.length) + data/this.data.length);
+		this.pivAvg = (this.pivAvg * ((this.data.length-1)/this.data.length) + data/this.data.length);
 		return true;
 
 	}

interface.js

@@ -9,8 +9,8 @@ function windowResized() {
 
 function mousePressed() {
 
-	//noLoop();
-	//redraw();
+	noLoop();
+	redraw();
 
 }
 
@@ -46,7 +46,7 @@ function setup() {
 	starts = [];
 	ends = [];
 
-	let n = 500;
+	let n = 300;
 
 	for (let i = 0; i < n; i++) {
 
@@ -58,8 +58,8 @@ function setup() {
 
 	shuffleJRS();
 
-	jrs.setZoneLimit(15);
-	jrs.setMachines(4);
+	jrs.setZoneLimit(5);
+	jrs.setMachines(10);
 	jrs.go();
 
 	barWidth = wW/jrs.data.length;

machine.js

@@ -25,18 +25,45 @@ class Machine {
 
 	}
 
+	setPivot() {
+		
+		let avg = (this.controller.data[this.start] + this.controller.data[this.end])/2;
+		let minDelta = abs(avg - this.controller.data[this.leftPivot]);
+		let deltaIndex = this.leftPivot;
+		
+		for (let i = this.leftPivot; i < this.end; i++) {
+			
+			if (abs(avg - this.controller.data[i]) < minDelta) {
+				
+				minDelta = abs(avg - this.controller.data[i]);
+				deltaIndex = i;
+				
+			}
+			
+		}
+		
+		this.controller.swap(this.leftPivot, deltaIndex);
+		return true;
+		
+	}
+	
 	sendWork(queueTask) {
 
 		this.start = queueTask[1];
 		this.end = queueTask[2];
 
-		this.leftPivot = this.start;
-		this.rightPivot = this.end;
+		this.leftPivot = this.start + 1;
+		this.rightPivot = this.end - 1;
 
-		this.bestBubbleValue = this.controller.data[this.end];
-		this.bestBubbleIndex = this.end;
+		this.bestBubbleValue = this.controller.data[this.rightPivot];
+		this.bestBubbleIndex = this.rightPivot;
 
-		if(this.end - this.start > this.controller.zoneLimitSize) {this.machineStatus = "WORK(JRS)";}
+		if(this.end - this.start > this.controller.zoneLimitSize) {
+			
+			this.setPivot();
+			this.machineStatus = "WORK(JRS)";
+			
+		}
 		else {this.machineStatus = "WORK(BBL)";}
 
 		return true;
@@ -53,8 +80,8 @@ class Machine {
 			if (this.leftPivot == this.rightPivot) {
 
 				//Create two queries and go DONE
-				if(this.leftPivot - this.start > 1) {this.controller.query(this.leftPivot - this.start, this.start, this.leftPivot);}
-				if(this.end - this.leftPivot + 1 > 1) {this.controller.query(this.end - this.leftPivot + 1, this.leftPivot +1, this.end);}
+				if(this.leftPivot - this.start > 3) {this.controller.query(this.leftPivot - this.start, this.start, this.leftPivot);}
+				if(this.end - this.leftPivot + 1 > 3) {this.controller.query(this.end - this.leftPivot, this.leftPivot, this.end);}
 
 				this.machineStatus = "DONE";
 				return true;
@@ -69,8 +96,16 @@ class Machine {
 
 		if(this.machineStatus == "WORK(BBL)") {
 
-			//Walk downwards and record lowest value
+			//Stop when done
+			if (this.leftPivot >= this.end - 1) {
+				
+				this.machineStatus = "DONE";
+				return true;
+				
+			}
+			
 			this.rightPivot--;
+			//record lowest value
 			if (this.controller.data[this.rightPivot] < this.bestBubbleValue) {
 
 				this.bestBubbleValue = this.controller.data[this.rightPivot];
@@ -79,21 +114,13 @@ class Machine {
 			}
 
 			//Swap when walker reaches the leftPivot
-			if(this.rightPivot == this.leftPivot) {
+			if(this.rightPivot <= this.leftPivot) {
 
-				this.controller.swap(this.rightPivot, this.bestBubbleIndex); 
-				this.bestBubbleValue = this.controller.data[this.end];
-				this.bestBubbleIndex = this.end;
+				this.controller.swap(this.leftPivot, this.bestBubbleIndex); 
+				this.bestBubbleValue = this.controller.data[this.end - 1];
+				this.bestBubbleIndex = this.end - 1;
 				this.leftPivot++; 
-				this.rightPivot = this.end;
-				return true;
-				
-			}
-			
-			//Stop when done
-			if (this.leftPivot == this.end) {
-				
-				this.machineStatus = "DONE";
+				this.rightPivot = this.end - 1;
 				return true;
 
 			}