Commit 8b9ffe6f authored by Robert Meyer's avatar Robert Meyer
Browse files

debug

parent eaf7e059
Pipeline #186019 failed with stage
in 1 minute and 30 seconds
This diff is collapsed.
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
"cache_IL1": "262144,4,4", "cache_IL1": "262144,4,4",
"cache_L2": "2097152,6,6", "cache_L2": "2097152,6,6",
"cache_L3": "12582912,40,40", "cache_L3": "12582912,40,40",
"no_time": true, "no_time": true
"no_emulation": true
} }
} }
] ]
......
This diff is collapsed.
...@@ -92,14 +92,14 @@ public class BasicController extends SimulationLoopNotifiable implements Runnabl ...@@ -92,14 +92,14 @@ public class BasicController extends SimulationLoopNotifiable implements Runnabl
result.export(); result.export();
} }
@Override
public void willExecuteLoop(List<SimulationLoopExecutable> simulationObjects, long totalTime, long deltaTime) { public void willExecuteLoop(List<SimulationLoopExecutable> simulationObjects, Instant totalTime, Duration deltaTime) {
this.result.setup_next_frame(totalTime); this.result.setup_next_frame(Duration.between(Instant.EPOCH, totalTime).toMillis());
System.out.print("T: "+totalTime); System.out.print("T: "+totalTime);
} }
@Override
public void didExecuteLoopForObject(SimulationLoopExecutable simulationObject, long totalTime, long deltaTime) { public void didExecuteLoopForObject(SimulationLoopExecutable simulationObject, Instant totalTime, Duration deltaTime) {
if (simulationObject instanceof PhysicalVehicle){ if (simulationObject instanceof PhysicalVehicle){
PhysicalVehicle vehicle = ((PhysicalVehicle) simulationObject); PhysicalVehicle vehicle = ((PhysicalVehicle) simulationObject);
if (this.result.add_car_frame(vehicle)){ if (this.result.add_car_frame(vehicle)){
......
...@@ -60,8 +60,9 @@ public class VehicleBuilder { ...@@ -60,8 +60,9 @@ public class VehicleBuilder {
EESimulator eeSim = new EESimulator(Instant.EPOCH); EESimulator eeSim = new EESimulator(Instant.EPOCH);
EEVehicleBuilder eeVehicleBuilder = new EEVehicleBuilder(eeSim); EEVehicleBuilder eeVehicleBuilder = new EEVehicleBuilder(eeSim);
InstantBus bus = new InstantBus(eeSim); InstantBus bus = new InstantBus(eeSim);
eeVehicleBuilder.createAllSensorsNActuators(bus); eeVehicleBuilder.createControllerSensors(bus);
eeVehicleBuilder.createController(model_server, AUTOPILOT_CONFIG, bus); eeVehicleBuilder.createMassPointActuators(bus);
eeVehicleBuilder.createController(model_server, config.autopilot_config, bus);
PhysicalVehicleBuilder physicalVehicleBuilder = getVehicleBuilder(config.physics_model); PhysicalVehicleBuilder physicalVehicleBuilder = getVehicleBuilder(config.physics_model);
Vehicle simVehicle = new Vehicle(physicalVehicleBuilder ,eeVehicleBuilder); Vehicle simVehicle = new Vehicle(physicalVehicleBuilder ,eeVehicleBuilder);
...@@ -83,7 +84,7 @@ public class VehicleBuilder { ...@@ -83,7 +84,7 @@ public class VehicleBuilder {
plannedX.initializeTrajectory(trajectoryCoordinates.get("x")); plannedX.initializeTrajectory(trajectoryCoordinates.get("x"));
StaticPlannedTrajectoryYSensor plannedY = (StaticPlannedTrajectoryYSensor) simVehicle.getEEVehicle().getSensorByType(BusEntry.PLANNED_TRAJECTORY_Y).get(); StaticPlannedTrajectoryYSensor plannedY = (StaticPlannedTrajectoryYSensor) simVehicle.getEEVehicle().getSensorByType(BusEntry.PLANNED_TRAJECTORY_Y).get();
plannedY.initializeTrajectory(trajectoryCoordinates.get("Y")); plannedY.initializeTrajectory(trajectoryCoordinates.get("y"));
result.register_car(physicalVehicle.getId(), config.name, config.config, trajectory); result.register_car(physicalVehicle.getId(), config.name, config.config, trajectory);
} }
......
usage-3.png

6.51 KB

Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment