Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
3da69df3
Commit
3da69df3
authored
Nov 07, 2018
by
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
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
VadereModelTests/TestEvents/scenarios/wait_event_2_sources_2_targets.scenario
View file @
3da69df3
...
...
@@ -102,7 +102,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 1
0
0.0,
"finishTime" : 1
5
0.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
...
...
@@ -217,7 +217,7 @@
"eventInfos" : [ {
"eventTimeframe" : {
"startTime" : 10.0,
"endTime" :
3
0.0,
"endTime" :
6
0.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
...
...
VadereModelTests/TestNonWorkingFeatures/scenarios/cooperative_behavior_agents_get_stuck.scenario
View file @
3da69df3
...
...
@@ -156,7 +156,7 @@
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" :
3
0,
"spawnNumber" :
5
0,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
...
...
@@ -176,7 +176,7 @@
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" :
3
0,
"spawnNumber" :
5
0,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
...
...
@@ -212,6 +212,7 @@
"y" : 0.0
}
}
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereSimulator/src/org/vadere/simulator/control/Simulation.java
View file @
3da69df3
...
...
@@ -280,6 +280,9 @@ public class Simulation {
private
void
updateCallbacks
(
double
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?
this
.
targetControllers
.
clear
();
for
(
Target
target
:
this
.
topographyController
.
getTopography
().
getTargets
())
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment