test

src/Controller.java

@@ -1,11 +1,79 @@
 public abstract class Controller
 {
-   protected Elevator elevator;
+   protected int numberOfFloors;
+   protected Elevator[] elevators;
+   protected boolean[] pushedUp;
+   protected boolean[] pushedDown;
+
+   /**
+    * Editor: Elijah Smith
+    * initialized size of new pushed fields.
+    */  
+   protected Controller(int numberOfFloors, int numberOfElevators)
+   {
+      this.numberOfFloors = numberOfFloors;
+
+      this.elevators = new Elevator[numberOfElevators];
+      for(int loop = 0; loop < numberOfElevators; loop++)
+      {
+         this.elevators[loop] = new Elevator(numberOfFloors);
+      }
 
-   protected Controller(Elevator elevator)
+      pushedUp = new boolean[numberOfFloors + 1];
+      pushedDown = new boolean[numberOfFloors + 1];
+   }
+
+   public abstract void next();
+
+   public int pushTrue()
    {
-      this.elevator = elevator;
+        int counter = 0;
+        for(int loop = 0; loop < pushedUp.length; loop++)
+        {
+            if(pushedUp[loop] || pushedDown[loop])
+               counter++;
+        }
+        return counter;
    }
+     /**
+     * Editor: Elijah Smith
+     * Issue #108 moving this method from Elevator
+     */ 
+    public void pushUp(int currentFloor) {
+        pushedUp[currentFloor] = true;    
+    }
 
-   public abstract void next();
+    /**
+     * Editor: Elijah Smith
+     * Issue #108 moving this method from Elevator
+     */ 
+    public void pushDown(int currentFloor) {
+        pushedDown[currentFloor] = true;
+   }
+
+   public int getNumberOfFloors()
+   {
+      return numberOfFloors;
+   }
+
+   public Elevator[] getElevators()
+   {
+      return elevators;
+   }
+
+   /**
+    * Author: Elijah Smith
+    * accessor for boolean array pushedUp[]
+    */
+   public boolean[] getPushedUpArray() {
+        return this.pushedUp;
+   }
+
+   /**
+    * Author: Elijah Smith
+    * accessor for boolean array pushedDown[]
+    */ 
+   public boolean[] getPushedDownArray() {
+        return this.pushedDown;
+   }
 }

src/DefaultController.java

@@ -1,12 +1,151 @@
+
+import java.util.ArrayList;
+
 public class DefaultController extends Controller
 {
-   public DefaultController(Elevator elevator)
+   private Timer time = new Timer(3000);
+   private boolean leftMovingUp;
+   private boolean leftMovingDown;
+   private boolean leftRest;
+
+   private boolean rightMovingUp;
+   private boolean rightMovingDown;
+   private boolean rightRest;
+
+   public DefaultController(int numberOfFloors, int numberOfElevators)
    {
-      super(elevator);
+      super(numberOfFloors, numberOfElevators);
+
+      super.elevators[1] = new Elevator(super.numberOfFloors - 1, super.numberOfFloors);
+
+      leftMovingUp = false;
+      leftMovingDown = false;
+      leftRest = true;
+
+      rightMovingUp = false;
+      rightMovingDown = false;
+      rightRest = true;
    }
 
    public void next()
    {
+      Elevator leftElev = super.elevators[0];
+      int leftCurrentFloor = leftElev.getCurrentFloor();
+      boolean[] leftDestFloors = leftElev.getDestinationFloor();
+
+      Elevator rightElev = super.elevators[1];
+      int rightCurrentFloor = rightElev.getCurrentFloor();
+      boolean[] rightDestFloors = rightElev.getDestinationFloor();
+
+      if(super.pushTrue() == 0)
+      {
+         if(leftElev.hasDestFloors() == 0)
+         {
+            if(leftCurrentFloor > 1)
+            {
+               leftMovingDown = true;
+               leftMovingUp = false;
+            }
+            else
+            {
+               leftMovingDown = false;
+               leftMovingUp = false;
+               leftRest = true;
+            }
+         }
+
+         if(rightElev.hasDestFloors() == 0)
+         {
+            if(rightCurrentFloor < super.numberOfFloors)
+            {
+               rightMovingUp = true;
+               rightMovingDown = false;
+            }
+            else 
+            {
+               rightMovingUp = false;
+               rightMovingDown = false;
+               rightRest = true;
+            }
+         }
+      }
+      else
+      {
+         int pushedUp = 0;
+         int pushedDown = 0;
+
+         for(int loop = 1; loop <= super.numberOfFloors; loop++)
+         {
+            if(super.pushedUp[loop])
+               pushedUp++;
+
+            if(super.pushedDown[loop])
+               pushedDown++;
+         }
+
+         if(pushedUp > 0 && !rightMovingUp && !leftMovingUp)
+         {
+            leftMovingUp = true;
+            leftMovingDown = false;
+            leftRest = false;
+         }
+
+         if(pushedDown > 0 && !rightMovingDown && !leftMovingDown)
+         {
+            rightMovingDown = true;
+            rightMovingUp = false;
+            rightRest = false;
+         }
+
+      }
+
+
+      if((leftMovingUp && pushedUp[leftCurrentFloor]) || (leftMovingDown && pushedDown[leftCurrentFloor]) || leftDestFloors[leftCurrentFloor])
+      {
+         leftElev.stop();
+
+         if(leftMovingUp)
+         {
+            pushedUp[leftCurrentFloor] = false;
+         }
+         else if(leftMovingDown)
+         {
+            pushedDown[leftCurrentFloor] = false;
+         }
+      }
+      else if(leftMovingUp)
+      {
+         leftElev.moveUp();
+      }
+      else if(leftMovingDown)
+      {
+         leftElev.moveDown();
+      }
+
+      if((rightMovingUp && pushedUp[rightCurrentFloor]) || (rightMovingDown && pushedDown[rightCurrentFloor]) || rightDestFloors[rightCurrentFloor])
+      {
+         rightElev.stop();
+
+         if(rightMovingUp)
+         {
+            pushedUp[rightCurrentFloor] = false;
+         }
+         else if(rightMovingDown)
+         {
+            pushedDown[rightCurrentFloor] = false;
+         }
+      }
+      else if(rightMovingUp)
+      {
+         rightElev.moveUp();
+      }
+      else if(rightMovingDown)
+      {
+         rightElev.moveDown();
+      }
+
+      time.run();
 
    }
+
 }

src/Display.java

@@ -1,58 +1,94 @@
-/*
- *
- *Author Jake Wooten
- * Iusse #7
- * */
-
-public class Display {
-
-Elevator elevator;
-Passenger passenger;
-
-    public Display(Passenger passenger, Elevator elevator) {
-
-        this.passenger = passenger;
-        this.elevator = elevator;
-    }
-    /*
-     *Displays floor passenger is currently on
-     */
-
-    public void display_currentP () {
-
-
-        System.out.println("Passenger is on floor " + passenger.getStartFloor());
-    }
-
-    /*
-     *Displays the floor the passenger has selected
-     */
-
-    public void display_selectP () {
-
-        System.out.println("Passenger has selected floor " + passenger.getDestinationFloor());
-    }
-
-    /*
-     *Displays the floor the passenger has arrived at
-     */
-    public void display_destP () {
-        System.out.println("Passenger has arrived at floor " + passenger.getDestinationFloor());
-    }
-
-    /*
-     *Displays the floor the elevator leaves from
-     */
-    public void display_currentE () {
-
-        System.out.println("Elevator doors close\nElevator leaves from floor " + elevator.getCurrentFloor());
-    }
-
-    /*
-     *Displays the floor the elevator has arrived at
-     */
-    public void display_destE () {
-
-        System.out.println("Elevator doors open\nElevator arrives at floor " + elevator.getDestinationFloor());
-    }
+import java.util.ArrayList;
+
+public class Display 
+{
+   private PassengerManager passengerManager;
+   private Controller control;
+
+   public Display(PassengerManager passengerManager, Controller control) 
+   {   
+       this.passengerManager = passengerManager;
+       this.control = control;
+
+       start();
+   }
+
+   public void display()
+   { 
+      System.out.println("=============================================================");
+
+      ArrayList<Passenger> passengers = passengerManager.getPassengers();
+      for(int loop = 0; loop < passengers.size(); loop++)
+      {
+         Passenger passenger = passengers.get(loop);
+         printPassenger(loop, passenger);
+      }
+
+      System.out.println("=============================================================");
+
+      Elevator[] elevators = control.getElevators();
+      for(int loop = 0; loop < elevators.length; loop++)
+      {
+         printElevator(loop, elevators[loop]);
+         System.out.println("=============================================================");
+      }
+
+      System.out.println("=============================================================\n\n");
+   }
+
+   public void start()
+   {
+       System.out.println("Welcome to our Elevator Simulation:\n  (Enter Ctrl+C to exit simulation) \n\n\n");
+   }
+
+   public void printPassenger(int number, Passenger passenger)
+   {
+         if(passenger.getWaiting())
+         {
+            System.out.print("Passenger " + number + " is on Floor " + passenger.getStartFloor());
+
+            if(passenger.getStartFloor() > passenger.getDestinationFloor())
+            {
+               System.out.println(" waiting to go down to " + passenger.getDestinationFloor() + ".");
+            }
+            else
+            {
+               System.out.println(" waiting to go up to " + passenger.getDestinationFloor() + ".");
+            }
+         }
+   }
+
+   public void printElevator(int number, Elevator elevator)
+   {
+      if(elevator.getStopped())
+      {
+         System.out.println("Elevator " + number + " has stopped on Floor " + elevator.getCurrentFloor());
+         System.out.println("Elevator doors have opened.");
+
+         ArrayList<Passenger> passengers = passengerManager.getPassengers();
+         for(int loop = 0; loop < passengers.size(); loop++)
+         {
+            Passenger passenger = passengers.get(loop);
+
+            if(elevator.getCurrentFloor() == passenger.getStartFloor())
+            {
+               System.out.println("Passenger " + loop + " has boarded the elevator.");
+            }
+            else if(passenger.getRidingElev() == number)
+            {
+               System.out.println("Passenger " + loop + " has left the elevator.");
+            }
+            else if(passenger.getRiding() && passenger.getRidingElev() == number)
+            {
+               System.out.println("Passenger " + loop + " has left the elevator.");
+            }
+
+         }
+         System.out.println("Elevator doors have closed.");
+      }
+      else
+      {
+         System.out.println("Elevator " + number + " is on Floor " + elevator.getCurrentFloor());
+      }
+   }
 }