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

             usleep (ELEVATOR_TIME_PAUSE_USEC);
+        }
         pthis->run_elevator_logic ();
-#ifndef QUIET
-        //std::cout << pthis << " Position: " << pthis->current_floor << std::endl;
-#endif
         usleep (ELEVATOR_TIME_DELAY_USEC);
+    }
+}
 void Elevator::thread_start ()
             /* Move towards the direction that has more floors to stop at.
              * Prefer DOWN if there is a tie. */
             if (has_floors_to_stop_at ())
+            {
-                direction = (floors_above_current () > floors_below_current ()) ? MOVE_UP : MOVE_DOWN;
+                if (floors_above_current () > floors_below_current ())
+                    direction = MOVE_UP;
+                else
+                    direction = MOVE_DOWN;
 #ifndef QUIET
+                if (direction == MOVE_UP)
+                    std::cout << "changed direction to up" << std::endl;
+                else
-                printf ("changed direction to: %s\n", (direction == MOVE_UP) ? "MOVE_UP" : "MOVE_DOWN");
+                    std::cout << "changed direction to down" << std::endl;
 #endif
+            }
             break;
         case MOVE_UP:
             /* Decide if we should stop at the floor we're at */
             if (should_stop_at_current_floor ())
-            {
                 stop_at_floor (MOVE_UP);
-            }
             /* Decide to sit idle if we have no more floors to stop at */
             if (!has_floors_to_stop_at ())
+            {
 #ifndef QUIET
         case MOVE_DOWN:
             /* Decide if we should stop at the floor we're at */
             if (should_stop_at_current_floor ())
-            {
                 stop_at_floor (MOVE_DOWN);
-            }
             /* Decide to sit idle if we have no more floors to stop at */
             if (!has_floors_to_stop_at ())
+            {
 #ifndef QUIET

Subversion Repositories programming

(root)/school/cs480/elevator/elevator.cpp – Rev 348 → 350