Fix broken elevator 0

elevator.js

@@ -22,7 +22,7 @@
 		// Functions
 		// ----
 
-		function getClosestFloor(currentFloor, floorList, direction = IDLE, ignoredFloors = new Set()){
+		function getClosestFloor(currentFloor, floorList, ignoredFloors = new Set(), direction = IDLE){
 			let closestFloor = currentFloor;
 			let distance     = floorCount;
 			let newDistance  = distance;
@@ -49,18 +49,27 @@
 			}
 		}
 
-		function sendToNext(elevator, destinations, requests, restFloors) {
-			if (elevator.loadFactor() < 1) {
+		function sendToNext(elevators, elevatorIndex, destinations, requests, restFloors) {
+			elevator = elevators[elevatorIndex]
+			if (elevator.loadFactor() < 0.8) {
 				if (requests[UP].size > 0 || requests[DOWN].size > 0 || destinations.size > 0) {
 					let allStops = new Set([...destinations, ...requests[UP], ...requests[DOWN]]);
 					try {
-						elevator.goToFloor(getClosestFloor(elevator.currentFloor(), allStops));
+						floorNum = getClosestFloor(elevator.currentFloor(), allStops)
+						console.log("> Sending elevator[" + elevatorIndex + "] to floor[" + floorNum + "]");
+						elevator.goToFloor(floorNum);
 					} catch (e) {
+						console.log("> No closest floor. Sending elevator[" + elevatorIndex + "] to rest floor[" + restFloors[1] + "]");
 						elevator.goToFloor(restFloors[1]);
 					}
+				} else {
+					console.log("> Sending elevator[" + elevatorIndex + "] to rest floor[" + restFloors[1] + "]");
+					elevator.goToFloor(restFloors[1]);
 				}
 			} else {
-				elevator.goToFloor(getClosestFloor(elevator.currentFloor(), destinations));
+				floorNum = getClosestFloor(elevator.currentFloor(), destinations)
+				console.log("> Sending elevator[" + elevatorIndex + "] to destination floor[" + floorNum + "]");
+				elevator.goToFloor(floorNum);
 			}
 		}
 
@@ -69,14 +78,15 @@
 			let distance        = floorCount;
 			let newDistance     = distance;
 
-			elevators.forEach(function (elevator) {
+			elevators.forEach(function (elevator, elevatorIndex) {
 				newDistance = Math.abs(elevator.currentFloor() - floorNum);
 				if (newDistance < distance) {
 					distance = newDistance;
-					closestElevator = elevators.indexOf(elevator);
+					closestElevator = elevatorIndex;
 				}
 			});
 
+			//console.log("Closest is elevator[" + closestElevator + "]")
 			elevators[closestElevator].goToFloor(floorNum);
 		}
 
@@ -102,14 +112,14 @@
 
 		floors.forEach(function (floor) {
 			floor.on("up_button_pressed", function() {
-				console.log("> Up request on floor[" + floor.level + "]");
-				requests[UP].add(floor.floorNum);
-				bringClosestElevator(floor.floorNum);
+				//console.log("> Up request on floor[" + floor.level + "]");
+				requests[UP].add(floor.level);
+				//bringClosestElevator(floor.level);
 			});
 			floor.on("down_button_pressed", function() {
-				console.log("> Down request on floor[" + floor.level + "]");
-				requests[DOWN].add(floor.floorNum);
-				bringClosestElevator(floor.floorNum);
+				//console.log("> Down request on floor[" + floor.level + "]");
+				requests[DOWN].add(floor.level);
+				//bringClosestElevator(floor.level);
 			});
 		});
 
@@ -117,28 +127,29 @@
 		// Elevators
 		// ----
 
-		elevators.forEach(function (elevator) {
+		elevators.forEach(function (elevator, elevatorIndex) {
 
 			// Basic elevator info
-			const elevatorIndex = elevators.indexOf(elevator);
 			const restFloors = [
-				(elevatorIndex + 0) * Math.floor(floorCount / (elevatorCount + 1)),
+				elevatorIndex * Math.floor(floorCount / (elevatorCount + 1)),
 				(elevatorIndex + 1) * Math.floor(floorCount / (elevatorCount + 1)),
 				(elevatorIndex + 2) * Math.floor(floorCount / (elevatorCount + 1))
 			]
 
+			//console.log("Rest floors for elevator[" + elevatorIndex + "]: " + restFloors[0] + ", " + restFloors[1] + ", and " + restFloors[2])
+
 			elevator.on("floor_button_pressed", function(floorNum) {
-				console.log("> Pressed floor[" + floorNum + "] on elevator[" + elevatorIndex + "]");
+				//console.log("> Pressed floor[" + floorNum + "] on elevator[" + elevatorIndex + "]");
 				destinations.add(floorNum);
-				sendToNext(elevator, destinations, requests, restFloors);
 			});
 
 			// Elevator variables
 			let destinations = new Set();
 
 			// Start
-			setDirection(elevator, UP); // Starts on the ground floor
+			setDirection(elevator, IDLE); // Starts on the ground floor
 			console.log("> Sending elevator[" + elevatorIndex + "] to floor[" + restFloors[0] + "]");
+
 			elevator.goToFloor(restFloors[0]); // Closest rest floor
 
 			// Idle
@@ -148,7 +159,7 @@
 				if (requests[UP].size == 0 && requests[DOWN].size == 0 && destinations.size == 0) {
 					elevator.goToFloor(restFloors[1]);
 				} else {
-					sendToNext(elevator, destinations, requests, restFloors);
+					sendToNext(elevators, elevatorIndex, destinations, requests, restFloors);
 				}
 			});
 
@@ -165,12 +176,12 @@
 
 			// Stopped
 			elevator.on("stopped_at_floor", function(floorNum) {
-				console.log("> elevator[" + elevatorIndex + "] stopped at floor[" + floorNum + "]");
+				//console.log("> elevator[" + elevatorIndex + "] stopped at floor[" + floorNum + "]");
 				destinations.delete(floorNum);
 				requests[UP].delete(floorNum);
 				requests[DOWN].delete(floorNum);
 
-				sendToNext(elevator, destinations, requests, restFloors);
+				sendToNext(elevators, elevatorIndex, destinations, requests, restFloors);
 			});
 		});
 	},