Simplify calls

Passes challenges 1-4 somewhat consistently.

elevator.js

@@ -56,24 +56,29 @@
 					let allStops = new Set([...destinations, ...requests[UP], ...requests[DOWN]]);
 					try {
 						floorNum = getClosestFloor(elevator.currentFloor(), allStops)
-						console.log("> Sending elevator[" + elevatorIndex + "] to floor[" + floorNum + "]");
+						//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] + "]");
+						//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] + "]");
+					//console.log("> Sending elevator[" + elevatorIndex + "] to rest floor[" + restFloors[1] + "]");
 					elevator.goToFloor(restFloors[1]);
 				}
 			} else {
-				floorNum = getClosestFloor(elevator.currentFloor(), destinations)
-				console.log("> Sending elevator[" + elevatorIndex + "] to destination floor[" + floorNum + "]");
-				elevator.goToFloor(floorNum);
+				try {
+					floorNum = getClosestFloor(elevator.currentFloor(), destinations)
+					console.log("> Sending elevator[" + elevatorIndex + "] to destination floor[" + floorNum + "]");
+					elevator.goToFloor(floorNum);
+				} catch (e) {
+					//console.log("> No closest floor. Sending elevator[" + elevatorIndex + "] to rest floor[" + restFloors[1] + "]");
+					elevator.goToFloor(restFloors[1]);
+				}
 			}
 		}
 
-		function bringClosestElevator(floorNum) {
+		function getClosestElevator(floorNum) {
 			let closestElevator = 0;
 			let distance        = floorCount;
 			let newDistance     = distance;
@@ -87,7 +92,7 @@
 			});
 
 			//console.log("Closest is elevator[" + closestElevator + "]")
-			elevators[closestElevator].goToFloor(floorNum);
+			return closestElevator;
 		}
 
 		function setDirection(elevator, direction){
@@ -114,12 +119,10 @@
 			floor.on("up_button_pressed", function() {
 				//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.level);
-				//bringClosestElevator(floor.level);
 			});
 		});
 
@@ -129,32 +132,22 @@
 
 		elevators.forEach(function (elevator, elevatorIndex) {
 
-			// Basic elevator info
+			// Elevator info and variables
+			let destinations = new Set();
 			const restFloors = [
 				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 + "]");
-				destinations.add(floorNum);
-			});
-
-			// Elevator variables
-			let destinations = new Set();
-
 			// Start
-			setDirection(elevator, IDLE); // Starts on the ground floor
-			console.log("> Sending elevator[" + elevatorIndex + "] to floor[" + restFloors[0] + "]");
-
-			elevator.goToFloor(restFloors[0]); // Closest rest floor
+			setDirection(elevator, UP); // Starts on the ground floor
+			console.log("> Elevator[" + elevatorIndex + "] rest floors are " + restFloors[0] + ", " + restFloors[1] + ", and " + restFloors[2] + ". Starting at " + restFloors[0] + ".")
+			elevator.goToFloor(restFloors[0]); // Nearest rest floor
 
 			// Idle
 			elevator.on("idle", function() {
-				console.log("> Elevator[" + elevatorIndex + "] is idle")
+				//console.log("> Elevator[" + elevatorIndex + "] is idle")
 				setDirection(elevator, IDLE);
 				if (requests[UP].size == 0 && requests[DOWN].size == 0 && destinations.size == 0) {
 					elevator.goToFloor(restFloors[1]);
@@ -165,23 +158,23 @@
 
 			// Passing
 			elevator.on("passing_floor", function(floorNum, direction) {
-				if (elevator.loadFactor() < 1) {
-					if (requests[UP].has(floorNum) || requests[DOWN].has(floorNum) || destinations.has(floorNum)) {
-						elevator.goToFloor(floorNum, true);
-					}
-				} else if (destinations.has(floorNum)) {
+				if (elevator.loadFactor() < 1 && (requests[UP].has(floorNum) || requests[DOWN].has(floorNum))) {
 					elevator.goToFloor(floorNum, true);
 				}
 			});
 
+			// Buttons
+			elevator.on("floor_button_pressed", function(floorNum) {
+				//console.log("> Pressed floor[" + floorNum + "] on elevator[" + elevatorIndex + "]");
+				destinations.add(floorNum);
+			});
+
 			// Stopped
 			elevator.on("stopped_at_floor", function(floorNum) {
 				//console.log("> elevator[" + elevatorIndex + "] stopped at floor[" + floorNum + "]");
 				destinations.delete(floorNum);
 				requests[UP].delete(floorNum);
 				requests[DOWN].delete(floorNum);
-
-				sendToNext(elevators, elevatorIndex, destinations, requests, restFloors);
 			});
 		});
 	},