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
ecea56e5
Commit
ecea56e5
authored
Jan 15, 2020
by
Benedikt Kleinmeier
Browse files
In "SimplePerceptionModel", added "selectWaitInAreaContainingPedestrian()"
parent
24473b13
Changes
1
Hide whitespace changes
Inline
Side-by-side
VadereSimulator/src/org/vadere/simulator/control/psychology/perception/SimplePerceptionModel.java
View file @
ecea56e5
...
...
@@ -55,14 +55,10 @@ public class SimplePerceptionModel implements IPerceptionModel {
}
else
if
(
waitStimuli
.
size
()
>=
1
)
{
mostImportantStimulus
=
waitStimuli
.
get
(
0
);
}
else
if
(
waitInAreaStimuli
.
size
()
>=
1
)
{
for
(
Stimulus
stimulus
:
waitInAreaStimuli
)
{
WaitInArea
waitInArea
=
(
WaitInArea
)
stimulus
;
Stimulus
selectedWaitInArea
=
selectWaitInAreaContainingPedestrian
(
pedestrian
,
waitInAreaStimuli
);
boolean
pedInArea
=
waitInArea
.
getArea
().
contains
(
pedestrian
.
getPosition
());
if
(
pedInArea
)
{
mostImportantStimulus
=
waitInArea
;
}
if
(
selectedWaitInArea
!=
null
)
{
mostImportantStimulus
=
selectedWaitInArea
;
}
}
...
...
@@ -94,4 +90,19 @@ public class SimplePerceptionModel implements IPerceptionModel {
return
closestAndPerceptibleBang
;
}
private
Stimulus
selectWaitInAreaContainingPedestrian
(
Pedestrian
pedestrian
,
List
<
Stimulus
>
waitInAreaStimuli
)
{
WaitInArea
selectedWaitInArea
=
null
;
for
(
Stimulus
stimulus
:
waitInAreaStimuli
)
{
WaitInArea
waitInArea
=
(
WaitInArea
)
stimulus
;
boolean
pedInArea
=
waitInArea
.
getArea
().
contains
(
pedestrian
.
getPosition
());
if
(
pedInArea
)
{
selectedWaitInArea
=
waitInArea
;
}
}
return
selectedWaitInArea
;
}
}
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