The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 05e521aa authored by Christina's avatar Christina
Browse files

Merge remote-tracking branch 'origin/master' into number_instead_mean_time

parents e60fbdda 4be8e49f
Pipeline #262033 passed with stages
in 153 minutes and 37 seconds
......@@ -56,6 +56,12 @@ public class ThreatCognitionModel implements ICognitionModel {
// Current stimulus is a threat => store it and make clear that pedestrian is inside threat area.
pedestrian.getThreatMemory().add((Threat) stimulus);
pedestrian.setSelfCategory(SelfCategory.INSIDE_THREAT_AREA);
// Gerta suggests to apply SelfCategory.OUTSIDE_THREAT_AREA
// so that agents directly search a safe zone if they are blocked by a wall.
if (pedestrianIsBlockedByObstacle(pedestrian, topography)) {
pedestrian.setSelfCategory(SelfCategory.OUTSIDE_THREAT_AREA);
}
}
private boolean isNewThreatForPedestrian(Pedestrian pedestrian, Threat threat) {
......@@ -96,7 +102,8 @@ public class ThreatCognitionModel implements ICognitionModel {
boolean pedestrianIsInsideThreatArea = (distanceToThreat <= latestThreat.getRadius());
boolean pedestrianIsBlockedByObstacle = pedestrianIsBlockedByObstacle(pedestrian, topography);
// Gerta suggests to apply SelfCategory.OUTSIDE_THREAT_AREA to agents if they are blocked by a wall.
// Gerta suggests to apply SelfCategory.OUTSIDE_THREAT_AREA
// so that agents directly search a safe zone if they are blocked by a wall.
if (pedestrianIsInsideThreatArea && pedestrianIsBlockedByObstacle == false) {
pedestrian.setSelfCategory(SelfCategory.INSIDE_THREAT_AREA);
} else {
......
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