Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
vadere
vadere
Commits
273f4038
Commit
273f4038
authored
Apr 17, 2020
by
Christina
Browse files
update scenario
parent
38f232da
Pipeline
#238071
failed with stages
in 2 minutes and 26 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario
View file @
273f4038
...
...
@@ -93,7 +93,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 1
00
00.0,
"finishTime" : 1
5
00.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" : true,
...
...
@@ -1781,7 +1781,7 @@
"nextSpeed" : -1.0
}, {
"id" : 902,
"absorbing" :
tru
e,
"absorbing" :
fals
e,
"shape" : {
"x" : 14.6,
"y" : 17.2,
...
...
@@ -2105,7 +2105,7 @@
"reachDistance" : 0.0,
"nextTargetIsPedestrian" : false,
"nextTarget" : [ 301, 400, 402, 404, 405, 505, 406, 601, 602, 603, 604, 407, 408, 409, 509, 410, 411, 412, 413, 513, 414, 415, 900, 800, 803 ],
"probabilityToChangeTarget" : [ 1.0 ]
"probabilityToChangeTarget" : [
0.1, 0.4, 0.4, 0.4, 0.8, 0.4, 0.8, 0.1, 0.1, 0.1, 0.1, 0.8, 0.4, 0.8, 0.8, 0.4, 0.6, 0.4, 0.6, 0.4, 0.4, 0.4, 0.3, 1.0,
1.0 ]
}, {
"id" : 13,
"shape" : {
...
...
@@ -2217,13 +2217,20 @@
},
"stimulusInfos" : [ {
"timeframe" : {
"startTime" :
1
0.0,
"endTime" :
3
0.0,
"startTime" : 0.0,
"endTime" :
1
0.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"stimuli" : [ {
"type" : "Wait"
"type" : "WaitInArea",
"area" : {
"x" : 0.0,
"y" : 0.0,
"width" : 10.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
} ]
} ]
}
...
...
VadereSimulator/src/org/vadere/simulator/control/psychology/perception/SimplePerceptionModel.java
View file @
273f4038
...
...
@@ -45,6 +45,8 @@ public class SimplePerceptionModel implements IPerceptionModel {
List
<
Stimulus
>
changeTargetStimuli
=
stimuli
.
stream
().
filter
(
stimulus
->
stimulus
instanceof
ChangeTarget
).
collect
(
Collectors
.
toList
());
List
<
Stimulus
>
changeTargetScriptedStimuli
=
stimuli
.
stream
().
filter
(
stimulus
->
stimulus
instanceof
ChangeTargetScripted
).
collect
(
Collectors
.
toList
());
// place List changepersonalspace here
if
(
changeTargetScriptedStimuli
.
size
()
>=
1
)
{
mostImportantStimulus
=
changeTargetScriptedStimuli
.
get
(
0
);
}
else
if
(
changeTargetStimuli
.
size
()
>=
1
)
{
...
...
@@ -64,6 +66,7 @@ public class SimplePerceptionModel implements IPerceptionModel {
mostImportantStimulus
=
selectedWaitInArea
;
}
}
else
if
(
true
){}
// place changepersonalspace here
return
mostImportantStimulus
;
}
...
...
VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDriven.java
View file @
273f4038
...
...
@@ -72,6 +72,7 @@ public class UpdateSchemeEventDriven implements UpdateSchemeOSM {
osmBehaviorController
.
wait
(
pedestrian
,
topography
,
timeStepInSec
);
}
else
if
(
selfCategory
==
SelfCategory
.
CHANGE_TARGET
)
{
osmBehaviorController
.
changeTarget
(
pedestrian
,
topography
);
//else if
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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