From: Ira W. Snyder <devel@irasnyder.com>
Date: Sun, 7 Oct 2007 04:14:00 +0000 (-0700)
Subject: Add Elevator Number to Elevators
X-Git-Url: https://irasnyder.com/gitweb/?a=commitdiff_plain;h=a897a1cb95028e3dbfa370ddafcc9a27110f96a7;hp=0f2350d5ad9a6bc431bbcce84e8b61a784328bea;p=cs356-p1-elevator.git

Add Elevator Number to Elevators

All of the Elevators need a unique number so that they can call into the
GUI and update their positions, etc.

Signed-off-by: Ira W. Snyder <devel@irasnyder.com>
---

diff --git a/elevator.cpp b/elevator.cpp
index d4e7cfb..4a5eb37 100644
--- a/elevator.cpp
+++ b/elevator.cpp
@@ -1,21 +1,23 @@
 #include "elevator.hpp"
 
-Elevator::Elevator ()
+Elevator::Elevator (int elevator_number)
 	: state_(STATE_IDLE)
 	, wait_(0)
 	, direction_(IDLE)
 	, position_()
 	, stops_()
+	, number_(elevator_number)
 {
 	// Intentionally Left Empty
 }
 
-Elevator::Elevator (int starting_floor)
+Elevator::Elevator (int starting_floor, int elevator_number)
 	: state_(STATE_IDLE)
 	, wait_(0)
 	, direction_(IDLE)
 	, position_(starting_floor)
 	, stops_()
+	, number_(elevator_number)
 {
 	// Intentionally Left Empty
 }
diff --git a/elevator.hpp b/elevator.hpp
index de8d71b..a5b5500 100644
--- a/elevator.hpp
+++ b/elevator.hpp
@@ -21,8 +21,8 @@ enum Event { EVT_IDLE, EVT_UP, EVT_DOWN, EVT_WAIT, EVT_OPEN_DOOR, EVT_CLOSE_DOOR
 class Elevator
 {
 	public:
-		Elevator ();
-		Elevator (int starting_floor);
+		Elevator (int elevator_number);
+		Elevator (int starting_floor, int elevator_number);
 
 		void stop_at (Stop &stop);
 		float distance_from (Position& pos) const;
@@ -56,6 +56,9 @@ class Elevator
 		State state_;
 		int wait_;
 
+		/* Elevator Number: Used to make calls into the GUI */
+		int number_;
+
 		static const float ELEVATOR_STEP = 0.1;
 };
 
diff --git a/elevatorcontroller.cpp b/elevatorcontroller.cpp
index 2baea64..d5f760c 100644
--- a/elevatorcontroller.cpp
+++ b/elevatorcontroller.cpp
@@ -10,7 +10,7 @@ ElevatorController::ElevatorController (int floors, int elevators)
 
 	/* Create and add all of the elevators */
 	for (int i=0; i<number_of_elevators_; i++)
-		elevators_.push_back (Elevator());
+		elevators_.push_back (Elevator(i));
 }
 
 static int choose_random_number_in_range (int low, int high)