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
46c443a6
Commit
46c443a6
authored
Jan 16, 2020
by
Benedikt Kleinmeier
Browse files
In "OSMBehaviorController", added TODO which must be discussed with Gerta
parent
0f71c2f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
VadereSimulator/src/org/vadere/simulator/control/psychology/cognition/ThreatCognitionModel.java
View file @
46c443a6
...
...
@@ -5,7 +5,6 @@ import org.vadere.state.psychology.perception.types.Bang;
import
org.vadere.state.psychology.perception.types.ElapsedTime
;
import
org.vadere.state.scenario.Pedestrian
;
import
org.vadere.state.scenario.Topography
;
import
org.vadere.state.simulation.FootstepHistory
;
import
org.vadere.util.geometry.shapes.VPoint
;
import
java.util.Collection
;
...
...
@@ -35,10 +34,8 @@ public class ThreatCognitionModel implements ICognitionModel {
for
(
Pedestrian
pedestrian
:
pedestrians
)
{
if
(
pedestrian
.
getMostImportantStimulus
()
instanceof
Bang
)
{
// I.e., pedestrian is inside bang radius.
pedestrian
.
setPerceivedThreat
(
pedestrian
.
getMostImportantStimulus
());
pedestrian
.
setSelfCategory
(
SelfCategory
.
INSIDE_THREAT_AREA
);
}
else
if
(
pedestrian
.
getMostImportantStimulus
()
instanceof
ElapsedTime
)
{
if
(
pedestrian
.
getPerceivedThreat
()
!=
null
)
{
...
...
VadereSimulator/src/org/vadere/simulator/models/psychology/selfcategorization/locomotion/OSMBehaviorController.java
View file @
46c443a6
...
...
@@ -13,7 +13,10 @@ import org.vadere.state.psychology.cognition.SelfCategory;
import
org.vadere.state.psychology.perception.types.Bang
;
import
org.vadere.state.psychology.perception.types.ChangeTarget
;
import
org.vadere.state.psychology.perception.types.Stimulus
;
import
org.vadere.state.scenario.*
;
import
org.vadere.state.scenario.Pedestrian
;
import
org.vadere.state.scenario.ScenarioElement
;
import
org.vadere.state.scenario.Target
;
import
org.vadere.state.scenario.Topography
;
import
org.vadere.state.simulation.FootStep
;
import
org.vadere.util.geometry.shapes.VPoint
;
import
org.vadere.util.geometry.shapes.Vector2D
;
...
...
@@ -22,7 +25,6 @@ import org.vadere.util.logging.Logger;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
* A class to encapsulate the behavior of a single {@link PedestrianOSM}.
...
...
@@ -148,6 +150,9 @@ public class OSMBehaviorController {
* In dangerous situation humans tend to escape to familiar places (safe zones).
* A pedestrian selects the target which is closest to its source as safe zone.
* Or if pedestrian has no target, select closest target as safe zone.
*
* TODO: Clarify with Gerta if this is really a plausible assumption for safe zones.
* An easier approach is to just use the closest target as safe zone.
*/
public
void
changeTargetToSafeZone
(
PedestrianOSM
pedestrian
,
Topography
topography
)
{
if
(
pedestrian
.
getCombinedPotentialStrategy
()
instanceof
TargetRepulsionStrategy
)
{
...
...
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