slight sim change and engine code fomat

testing

main/src/main/java/sd/config/SimulationConfig.java

@@ -227,6 +227,32 @@ public class SimulationConfig {
         return Double.parseDouble(properties.getProperty("vehicle.crossing.time.heavy", "4.0"));
     }
 
+    /**
+     * Gets the base travel time between intersections for light vehicles.
+     * @return The base travel time in seconds.
+     */
+    public double getBaseTravelTime() {
+        return Double.parseDouble(properties.getProperty("vehicle.travel.time.base", "8.0"));
+    }
+
+    /**
+     * Gets the travel time multiplier for bike vehicles.
+     * Bike travel time = base time × this multiplier.
+     * @return The multiplier for bike travel time.
+     */
+    public double getBikeTravelTimeMultiplier() {
+        return Double.parseDouble(properties.getProperty("vehicle.travel.time.bike.multiplier", "0.5"));
+    }
+
+    /**
+     * Gets the travel time multiplier for heavy vehicles.
+     * Heavy vehicle travel time = base time × this multiplier.
+     * @return The multiplier for heavy vehicle travel time.
+     */
+    public double getHeavyTravelTimeMultiplier() {
+        return Double.parseDouble(properties.getProperty("vehicle.travel.time.heavy.multiplier", "2.0"));
+    }
+
     // --- Statistics ---
 
     /**

main/src/main/java/sd/engine/SimulationEngine.java

@@ -41,12 +41,14 @@ public class SimulationEngine {
     private final PriorityQueue<Event> eventQueue;
 
     /**
-     * A map storing all intersections in the simulation, keyed by their ID (e.g., "Cr1").
+     * A map storing all intersections in the simulation, keyed by their ID (e.g.,
+     * "Cr1").
      */
     private final Map<String, Intersection> intersections;
 
     /**
-     * Responsible for creating new vehicles according to the configured arrival model.
+     * Responsible for creating new vehicles according to the configured arrival
+     * model.
      */
     private final VehicleGenerator vehicleGenerator;
 
@@ -82,6 +84,26 @@ public class SimulationEngine {
         this.vehicleCounter = 0;
     }
 
+    /**
+     * Calculates the travel time between intersections based on vehicle type.
+     *
+     * @param vehicleType The type of the vehicle.
+     * @return The travel time in seconds.
+     */
+    private double calculateTravelTime(VehicleType vehicleType) {
+        double baseTime = config.getBaseTravelTime();
+
+        switch (vehicleType) {
+            case BIKE:
+                return baseTime * config.getBikeTravelTimeMultiplier();
+            case HEAVY:
+                return baseTime * config.getHeavyTravelTimeMultiplier();
+            case LIGHT:
+            default:
+                return baseTime;
+        }
+    }
+
     /**
      * Initializes the simulation. This involves:
      * 1. Creating all {@link Intersection} and {@link TrafficLight} objects.
@@ -108,9 +130,9 @@ public class SimulationEngine {
      * and adds their corresponding traffic lights.
      */
     private void setupIntersections() {
-        String[] intersectionIds = {"Cr1", "Cr2", "Cr3", "Cr4", "Cr5"};
+        String[] intersectionIds = { "Cr1", "Cr2", "Cr3", "Cr4", "Cr5" };
         // Note: "North" is commented out, so it won't be created.
-        String[] directions = {/*"North",*/ "South", "East", "West"};
+        String[] directions = { /* "North", */ "South", "East", "West" };
 
         for (String id : intersectionIds) {
             Intersection intersection = new Intersection(id);
@@ -124,8 +146,7 @@ public class SimulationEngine {
                         id + "-" + direction,
                         direction,
                         greenTime,
-                    redTime
+                        redTime);
-                );
 
                 intersection.addTrafficLight(light);
             }
@@ -137,7 +158,8 @@ public class SimulationEngine {
     /**
      * Configures how vehicles should be routed between intersections.
      * This hardcoded logic defines the "map" of the city.
-     * * For example, `intersections.get("Cr1").configureRoute("Cr2", "East");` means
+     * * For example, `intersections.get("Cr1").configureRoute("Cr2", "East");`
+     * means
      * "at intersection Cr1, any vehicle whose *next* destination is Cr2
      * should be sent to the 'East' traffic light queue."
      */
@@ -156,12 +178,12 @@ public class SimulationEngine {
         intersections.get("Cr3").configureRoute("S", "South"); // "S" is the exit
 
         // Cr4 routing
-        //intersections.get("Cr4").configureRoute("Cr1", "North");
+        // intersections.get("Cr4").configureRoute("Cr1", "North");
         intersections.get("Cr4").configureRoute("Cr5", "East");
 
         // Cr5 routing
-        //intersections.get("Cr5").configureRoute("Cr2", "North");
+        // intersections.get("Cr5").configureRoute("Cr2", "North");
-        //intersections.get("Cr5").configureRoute("Cr4", "West");
+        // intersections.get("Cr5").configureRoute("Cr4", "West");
         intersections.get("Cr5").configureRoute("S", "East"); // "S" is the exit
     }
 
@@ -188,7 +210,8 @@ public class SimulationEngine {
      *
      * @param light          The {@link TrafficLight} that will change state.
      * @param intersectionId The ID of the intersection where the light is located.
-     * @param delay The time (in seconds) from {@code currentTime} when the change should occur.
+     * @param delay          The time (in seconds) from {@code currentTime} when the
+     *                       change should occur.
      */
     private void scheduleTrafficLightChange(TrafficLight light, String intersectionId, double delay) {
         double changeTime = currentTime + delay;
@@ -200,7 +223,8 @@ public class SimulationEngine {
      * Schedules the next {@link EventType#VEHICLE_GENERATION} event.
      * The time of the next arrival is determined by the {@link VehicleGenerator}.
      *
-     * @param baseTime The time from which to calculate the next arrival (usually {@code currentTime}).
+     * @param baseTime The time from which to calculate the next arrival (usually
+     *                 {@code currentTime}).
      */
     private void scheduleNextVehicleGeneration(double baseTime) {
         // Get the absolute time for the next arrival.
@@ -258,7 +282,8 @@ public class SimulationEngine {
 
     /**
      * Main event processing logic.
-     * Delegates the event to the appropriate handler method based on its {@link EventType}.
+     * Delegates the event to the appropriate handler method based on its
+     * {@link EventType}.
      *
      * @param event The {@link Event} to be processed.
      */
@@ -288,7 +313,8 @@ public class SimulationEngine {
      * at its first destination intersection.
      * 4. Schedules the *next* {@link EventType#VEHICLE_GENERATION} event.
      * (Note: This line is commented out in the original, which might be a bug,
-     * as it implies only one vehicle is ever generated. It should likely be active.)
+     * as it implies only one vehicle is ever generated. It should likely be
+     * active.)
      */
     private void handleVehicleGeneration() {
         Vehicle vehicle = vehicleGenerator.generateVehicle("V" + (++vehicleCounter), currentTime);
@@ -302,8 +328,8 @@ public class SimulationEngine {
         // Schedule arrival at first intersection
         String firstIntersection = vehicle.getCurrentDestination();
         if (firstIntersection != null && !firstIntersection.equals("S")) {
-            // Assume minimal travel time to first intersection (e.g., 1-3 seconds)
+            double travelTime = calculateTravelTime(vehicle.getType());
-            double arrivalTime = currentTime + 1.0 + Math.random() * 2.0;
+            double arrivalTime = currentTime + travelTime;
             Event arrivalEvent = new Event(arrivalTime, EventType.VEHICLE_ARRIVAL, vehicle, firstIntersection);
             eventQueue.offer(arrivalEvent);
         }
@@ -324,7 +350,8 @@ public class SimulationEngine {
      * current intersection using {@link Intersection#receiveVehicle(Vehicle)}.
      * 5. Attempts to process the vehicle immediately if its light is green.
      *
-     * @param event The arrival event, containing the {@link Vehicle} and intersection ID.
+     * @param event The arrival event, containing the {@link Vehicle} and
+     *              intersection ID.
      */
     private void handleVehicleArrival(Event event) {
         Vehicle vehicle = (Vehicle) event.getData();
@@ -359,7 +386,8 @@ public class SimulationEngine {
             return;
         }
 
-        // Add vehicle to the appropriate traffic light queue based on its next destination
+        // Add vehicle to the appropriate traffic light queue based on its next
+        // destination
         intersection.receiveVehicle(vehicle);
 
         // Try to process the vehicle immediately if its light is already green
@@ -373,7 +401,7 @@ public class SimulationEngine {
      * @param vehicle      The vehicle to process.
      * @param intersection The intersection where the vehicle is.
      */
-    private void tryProcessVehicle(Vehicle vehicle, Intersection intersection) { //FIXME
+    private void tryProcessVehicle(Vehicle vehicle, Intersection intersection) { // FIXME
         // Find the direction (and light) this vehicle is queued at
         // This logic is a bit flawed: it just finds the *first* non-empty queue
         // A better approach would be to get the light from the vehicle's route
@@ -443,7 +471,8 @@ public class SimulationEngine {
      * Handles {@link EventType#CROSSING_END}.
      * 1. Updates intersection and vehicle statistics.
      * 2. Checks the vehicle's *next* destination.
-     * 3. If the next destination is the exit ("S"), call {@link #handleVehicleExit(Vehicle)}.
+     * 3. If the next destination is the exit ("S"), call
+     * {@link #handleVehicleExit(Vehicle)}.
      * 4. Otherwise, schedule a {@link EventType#VEHICLE_ARRIVAL} event at the
      * *next* intersection, after some travel time.
      *
@@ -469,8 +498,9 @@ public class SimulationEngine {
         String nextDest = vehicle.getCurrentDestination();
         if (nextDest != null && !nextDest.equals("S")) {
             // Route to the *next* intersection
-            // Assume 5-10 seconds travel time between intersections
+            // Travel time varies by vehicle type: tmoto = 0.5 × tcarro, tcaminhão = 4 ×
-            double travelTime = 5.0 + Math.random() * 5.0; 
+            // tmoto
+            double travelTime = calculateTravelTime(vehicle.getType());
             double arrivalTime = currentTime + travelTime;
             Event arrivalEvent = new Event(arrivalTime, EventType.VEHICLE_ARRIVAL, vehicle, nextDest);
             eventQueue.offer(arrivalEvent);
@@ -499,7 +529,8 @@ public class SimulationEngine {
     /**
      * Handles {@link EventType#TRAFFIC_LIGHT_CHANGE}.
      * 1. Toggles the light's state (RED to GREEN or GREEN to RED).
-     * 2. If the light just turned GREEN, call {@link #processGreenLight(TrafficLight, Intersection)}
+     * 2. If the light just turned GREEN, call
+     * {@link #processGreenLight(TrafficLight, Intersection)}
      * to process any waiting vehicles.
      * 3. Schedules the *next* state change for this light based on its
      * green/red time duration.
@@ -572,7 +603,8 @@ public class SimulationEngine {
     }
 
     /**
-     * Utility method to get the configured crossing time for a given {@link VehicleType}.
+     * Utility method to get the configured crossing time for a given
+     * {@link VehicleType}.
      *
      * @param type The type of vehicle.
      * @return The crossing time in seconds.
@@ -603,6 +635,7 @@ public class SimulationEngine {
 
     /**
      * Gets the current simulation time.
+     * 
      * @return The time in virtual seconds.
      */
     public double getCurrentTime() {
@@ -612,6 +645,7 @@ public class SimulationEngine {
     /**
      * Gets a map of all intersections in the simulation.
      * Returns a copy to prevent external modification.
+     * 
      * @return A {@link Map} of intersection IDs to {@link Intersection} objects.
      */
     public Map<String, Intersection> getIntersections() {
@@ -620,6 +654,7 @@ public class SimulationEngine {
 
     /**
      * Gets the statistics collector instance.
+     * 
      * @return The {@link StatisticsCollector}.
      */
     public StatisticsCollector getStatisticsCollector() {

main/src/main/resources/simulation.properties

@@ -46,54 +46,54 @@ simulation.arrival.fixed.interval=2.0
 # === TRAFFIC LIGHT TIMINGS ===
 # Format: trafficlight.<intersection>.<direction>.<state>=<seconds>
 
-# Intersection 1
+# Intersection 1 (Entry point - balanced)
-trafficlight.Cr1.North.green=30.0
+trafficlight.Cr1.North.green=20.0
-trafficlight.Cr1.North.red=30.0
+trafficlight.Cr1.North.red=40.0
-trafficlight.Cr1.South.green=30.0
+trafficlight.Cr1.South.green=20.0
-trafficlight.Cr1.South.red=30.0
+trafficlight.Cr1.South.red=40.0
-trafficlight.Cr1.East.green=30.0
+trafficlight.Cr1.East.green=20.0
-trafficlight.Cr1.East.red=30.0
+trafficlight.Cr1.East.red=40.0
-trafficlight.Cr1.West.green=30.0
+trafficlight.Cr1.West.green=20.0
-trafficlight.Cr1.West.red=30.0
+trafficlight.Cr1.West.red=40.0
 
-# Intersection 2
+# Intersection 2 (Main hub - shorter cycles, favor East-West)
-trafficlight.Cr2.North.green=25.0
+trafficlight.Cr2.North.green=12.0
-trafficlight.Cr2.North.red=35.0
+trafficlight.Cr2.North.red=36.0
-trafficlight.Cr2.South.green=25.0
+trafficlight.Cr2.South.green=12.0
-trafficlight.Cr2.South.red=35.0
+trafficlight.Cr2.South.red=36.0
-trafficlight.Cr2.East.green=35.0
+trafficlight.Cr2.East.green=18.0
-trafficlight.Cr2.East.red=25.0
+trafficlight.Cr2.East.red=30.0
-trafficlight.Cr2.West.green=35.0
+trafficlight.Cr2.West.green=18.0
-trafficlight.Cr2.West.red=25.0
+trafficlight.Cr2.West.red=30.0
 
-# Intersection 3
+# Intersection 3 (Path to exit - favor East)
-trafficlight.Cr3.North.green=30.0
+trafficlight.Cr3.North.green=15.0
 trafficlight.Cr3.North.red=30.0
-trafficlight.Cr3.South.green=30.0
+trafficlight.Cr3.South.green=15.0
 trafficlight.Cr3.South.red=30.0
-trafficlight.Cr3.East.green=30.0
+trafficlight.Cr3.East.green=20.0
-trafficlight.Cr3.East.red=30.0
+trafficlight.Cr3.East.red=25.0
-trafficlight.Cr3.West.green=30.0
+trafficlight.Cr3.West.green=15.0
 trafficlight.Cr3.West.red=30.0
 
-# Intersection 4
+# Intersection 4 (Favor East toward Cr5)
-trafficlight.Cr4.North.green=30.0
+trafficlight.Cr4.North.green=15.0
 trafficlight.Cr4.North.red=30.0
-trafficlight.Cr4.South.green=30.0
+trafficlight.Cr4.South.green=15.0
 trafficlight.Cr4.South.red=30.0
-trafficlight.Cr4.East.green=30.0
+trafficlight.Cr4.East.green=20.0
-trafficlight.Cr4.East.red=30.0
+trafficlight.Cr4.East.red=25.0
-trafficlight.Cr4.West.green=30.0
+trafficlight.Cr4.West.green=15.0
 trafficlight.Cr4.West.red=30.0
 
-# Intersection 5
+# Intersection 5 (Near exit - favor East)
-trafficlight.Cr5.North.green=30.0
+trafficlight.Cr5.North.green=15.0
 trafficlight.Cr5.North.red=30.0
-trafficlight.Cr5.South.green=30.0
+trafficlight.Cr5.South.green=15.0
 trafficlight.Cr5.South.red=30.0
-trafficlight.Cr5.East.green=30.0
+trafficlight.Cr5.East.green=22.0
-trafficlight.Cr5.East.red=30.0
+trafficlight.Cr5.East.red=23.0
-trafficlight.Cr5.West.green=30.0
+trafficlight.Cr5.West.green=15.0
 trafficlight.Cr5.West.red=30.0
 
 # === VEHICLE CONFIGURATION ===
@@ -103,11 +103,19 @@ vehicle.probability.light=0.6
 vehicle.probability.heavy=0.2
 
 # Average crossing times (in seconds)
-vehicle.crossing.time.bike=1.5
+vehicle.crossing.time.bike=1.0
 vehicle.crossing.time.light=2.0
 vehicle.crossing.time.heavy=4.0
 
+# Travel times between intersections (in seconds)
+# Base time for light vehicles (cars)
+vehicle.travel.time.base=8.0
+# Bike travel time = 0.5 × car travel time
+vehicle.travel.time.bike.multiplier=0.5
+# Heavy vehicle travel time = 4 × bike travel time
+vehicle.travel.time.heavy.multiplier=2.0
+
 # === STATISTICS ===
 
 # Interval between dashboard updates (seconds)
-statistics.update.interval=10.0
+statistics.update.interval=1.0