Commit 3da69df3 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

In "Simulation.java", added TODO for cognition layer.

Updated also two scenario files.
parent b00267dd
Pipeline #74404 failed with stages
in 77 minutes and 19 seconds
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
} }
}, },
"attributesSimulation" : { "attributesSimulation" : {
"finishTime" : 100.0, "finishTime" : 150.0,
"simTimeStepLength" : 0.4, "simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0, "realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true, "writeSimulationData" : true,
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
"eventInfos" : [ { "eventInfos" : [ {
"eventTimeframe" : { "eventTimeframe" : {
"startTime" : 10.0, "startTime" : 10.0,
"endTime" : 30.0, "endTime" : 60.0,
"repeat" : false, "repeat" : false,
"waitTimeBetweenRepetition" : 0.0 "waitTimeBetweenRepetition" : 0.0
}, },
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
}, },
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 30, "spawnNumber" : 50,
"maxSpawnNumberTotal" : -1, "maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
}, },
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 30, "spawnNumber" : 50,
"maxSpawnNumberTotal" : -1, "maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
...@@ -212,6 +212,7 @@ ...@@ -212,6 +212,7 @@
"y" : 0.0 "y" : 0.0
} }
} }
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
...@@ -280,6 +280,9 @@ public class Simulation { ...@@ -280,6 +280,9 @@ public class Simulation {
private void updateCallbacks(double simTimeInSec) { private void updateCallbacks(double simTimeInSec) {
List<Event> events = eventController.getEventsForTime(simTimeInSec); List<Event> events = eventController.getEventsForTime(simTimeInSec);
// TODO: Implement "CognitionLayer" class and use it here, e.g. cognitionLayer(events, pedestrians)
// which calls pedestrian.setBehavior(...) or this methods returns List<Behavior, Pedestrian).
// TODO Why are target controllers readded in each simulation loop? // TODO Why are target controllers readded in each simulation loop?
this.targetControllers.clear(); this.targetControllers.clear();
for (Target target : this.topographyController.getTopography().getTargets()) { for (Target target : this.topographyController.getTopography().getTargets()) {
......
Markdown is supported
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