WebSVN – programming – Diff – /school/cs480/elevator/elevator.cpp

 // FIXME
 // FIXME
 // FIXME
 void debug_puts (const char* s)
+{
-#ifndef _NDEBUG
+#ifndef NO_DEBUG_PUTS
     puts (s);
 #endif
+}
 // FIXME
 // FIXME
+{
     this->terminate = false;
     this->pause = false;
     this->direction = IDLE;
     this->current_floor = 1.0;
+    this->controller = NULL;
     this->stop_at_floors = std::vector<bool> (num_floors+1, false);
+}
 Elevator::~Elevator ()
         case MOVE_UP:
             /* Decide if we should stop at the floor we're at */
             if (should_stop_at_current_floor ())
+            {
-                debug_puts ("stop at a floor -- while going up");
+                debug_puts ("stop at floor -- while going up");
                 stop_at_floors[(int)(current_floor+0.5)] = false;
+                have_user_enter_buttons ();
+            }
             /* Decide to sit idle if we have no more floors to stop at */
             if (!has_floors_to_stop_at ())
+            {
             /* Decide if we should stop at the floor we're at */
             if (should_stop_at_current_floor ())
+            {
                 debug_puts ("stop at floor -- while going down");
                 stop_at_floors[(int)(current_floor)] = false;
+                have_user_enter_buttons ();
+            }
             /* Decide to sit idle if we have no more floors to stop at */
             if (!has_floors_to_stop_at ())
+            {
+}
 /**
  * Call this to stop the thread from running.
  */
-void Elevator::thread_exit ()
+void Elevator::thread_stop ()
+{
     this->terminate = true;
+}
 /**
 float Elevator::get_current_floor ()
+{
     return current_floor;
+}
+void Elevator::set_controller (Controller *c)
+{
+    this->controller = c;
+}
+void Elevator::have_user_enter_buttons ()
+{
+    controller->pause_all_elevators ();
+    sleep (1);
+    std::string s;
+    std::cout << "Enter floors to stop at for elevator (space seperated): ";
+    getline (std::cin, s);
+    typedef std::vector<std::string> split_vector_type;
+    split_vector_type SplitVec;
+    boost::split (SplitVec, s, boost::is_any_of(" "));
+    std::cout << "found " << SplitVec.size() << " strings" << std::endl;
+    int i, val;
+    for (i=0; i<SplitVec.size(); i++)
+    {
+        val = atoi (SplitVec[i].c_str());
+        if (val > 0 && val <= num_floors)
+            this->push_button (val);
+    }
+    controller->unpause_all_elevators ();
+}

Subversion Repositories programming

(root)/school/cs480/elevator/elevator.cpp – Rev 330 → 331