leo/SD
1
0
Fork 0
mirror of https://github.com/davidalves04/Trabalho-Pratico-SD.git synced 2025-12-08 20:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move vehicle route advancement to intersection arrival

Browse Source
This commit is contained in:
David Alves
2025-10-30 15:57:58 +00:00
parent db5e01021a
commit dc4f567e1f
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/src/main/java/sd/IntersectionProcess.java
View File

@@ -280,8 +280,7 @@ public class IntersectionProcess {
System.out.println("[" + intersectionId + "] Sent vehicle " + vehicle.getId() + System.out.println("[" + intersectionId + "] Sent vehicle " + vehicle.getId() +
" to " + nextDestination); " to " + nextDestination);
// Update vehicle's path - advance to next destination in route // Note: vehicle route is advanced when it arrives at the next intersection
vehicle.advanceRoute();
} catch (IOException | InterruptedException e) { } catch (IOException | InterruptedException e) {
System.err.println("[" + intersectionId + "] Failed to send vehicle " + System.err.println("[" + intersectionId + "] Failed to send vehicle " +

18
main/src/main/java/sd/model/Intersection.java
View File

@@ -104,16 +104,28 @@ public class Intersection {
* Accepts an incoming vehicle and places it in the correct queue. * Accepts an incoming vehicle and places it in the correct queue.
* * This method: * * This method:
* 1. Increments the {@link #totalVehiclesReceived} counter. * 1. Increments the {@link #totalVehiclesReceived} counter.
* 2. Gets the vehicle's *next* destination (from {@link Vehicle#getCurrentDestination()}). * 2. Advances the vehicle's route (since it just arrived here)
* 3. Uses the {@link #routing} map to find the correct *direction* for that destination. * 3. Gets the vehicle's *next* destination (from {@link Vehicle#getCurrentDestination()}).
* 4. Adds the vehicle to the queue of the {@link TrafficLight} for that direction. * 4. Uses the {@link #routing} map to find the correct *direction* for that destination.
* 5. Adds the vehicle to the queue of the {@link TrafficLight} for that direction.
* *
* @param vehicle The {@link Vehicle} arriving at the intersection. * @param vehicle The {@link Vehicle} arriving at the intersection.
*/ */
public void receiveVehicle(Vehicle vehicle) { public void receiveVehicle(Vehicle vehicle) {
totalVehiclesReceived++; totalVehiclesReceived++;
// Advance route since vehicle just arrived at this intersection
vehicle.advanceRoute();
String nextDestination = vehicle.getCurrentDestination(); String nextDestination = vehicle.getCurrentDestination();
// Check if vehicle reached final destination
if (nextDestination == null) {
System.out.printf("[%s] Vehicle %s reached final destination%n",
this.id, vehicle.getId());
return;
}
String direction = routing.get(nextDestination); String direction = routing.get(nextDestination);
if (direction != null && trafficLights.containsKey(direction)) { if (direction != null && trafficLights.containsKey(direction)) {