diff --git a/src/BridgeSimulator.java b/src/BridgeSimulator.java index bbdf147..a4da1ec 100644 --- a/src/BridgeSimulator.java +++ b/src/BridgeSimulator.java @@ -16,7 +16,7 @@ public class BridgeSimulator { Random rand = new Random(); for (int i = 0; i < emergencies; i++) - emergencyTimes.add(rand.nextInt(simulationTime)); + emergencyTimes.add(rand.nextInt(simulationTime - 1)); int currentSimTime = 0; long lastTime = System.currentTimeMillis(); @@ -57,7 +57,9 @@ public class BridgeSimulator { int totalVehicles = trafficController.carCounter + trafficController.emergencyCounter + trafficController.truckCounter; + System.out.println("\nSimulation concludes after " + simulationTime + " seconds."); System.out.println("Total Vehicles: " + totalVehicles + ", Cars: " + trafficController.carCounter + ", Trucks: " + trafficController.truckCounter + ", Emergency Vehicles: " + trafficController.emergencyCounter + ", Vehicles Crossed: " + trafficController.crossings); + System.out.println(trafficController.left + " turned away due to excessive wait times."); } diff --git a/src/TrafficController.java b/src/TrafficController.java index 24edcb8..8dabd12 100644 --- a/src/TrafficController.java +++ b/src/TrafficController.java @@ -8,6 +8,7 @@ public class TrafficController { public int carCounter = 0; public int emergencyCounter = 0; public int crossings = 0; + public int left = 0; boolean northLast = true; diff --git a/src/Vehicle.java b/src/Vehicle.java index aa31a5d..97e7d27 100644 --- a/src/Vehicle.java +++ b/src/Vehicle.java @@ -33,8 +33,11 @@ public abstract class Vehicle implements Runnable { if (queue.tryAcquire()) trafficController.queueVehicle(this); - else + else { System.out.println(this.getType() + " " + id + " saw too many cars and left."); + trafficController.left++; + } + // // try {