Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

Commit 4e62c7b4 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

remove partial solution for linkedCell bug since it should be solved.

parent 5d97753e
Pipeline #65435 failed with stages
in 44 minutes and 29 seconds
......@@ -66,19 +66,10 @@ public class PotentialFieldPedestrianCompact implements PotentialFieldAgent {
public Collection<Pedestrian> getRelevantAgents(VCircle relevantArea,
Agent pedestrian, Topography scenario) {
List<Pedestrian> result = new LinkedList<>();
final double maxWalkedDistanceInSimTime = 0.4 * 3; // quick fix 0.4 = simtime, 3 = max velocity.
// select pedestrians within recognition distance
List<Pedestrian> closePedestrians = scenario.getSpatialMap(Pedestrian.class)
return scenario.getSpatialMap(Pedestrian.class)
.getObjects(relevantArea.getCenter(), this.width + pedestrian.getRadius() +
attributes.getVisionFieldRadius() + maxWalkedDistanceInSimTime);
result = closePedestrians;
return result;
attributes.getVisionFieldRadius());
}
@Override
......
......@@ -43,10 +43,8 @@ public class PotentialFieldPedestrianCompactSoftshell implements PotentialFieldA
@Override
public Collection<Pedestrian> getRelevantAgents(VCircle maxStepCircle,
Agent pedestrian, Topography scenario) {
final double maxWalkedDistanceInSimTime = 0.4 * 3; // quick fix 0.4 = simtime, 3 = max velocity.
List<Pedestrian> closePedestrians = scenario.getElements(Pedestrian.class)
.stream().filter(p -> p.getPosition().distance(maxStepCircle.getCenter()) <= this.personalWidth + maxStepCircle.getRadius() + maxWalkedDistanceInSimTime + pedestrian.getRadius()).collect(Collectors.toList());
List<Pedestrian> closePedestrians = scenario.getSpatialMap(Pedestrian.class).getObjects(maxStepCircle.getCenter(),
this.personalWidth + maxStepCircle.getRadius() + pedestrian.getRadius());
return closePedestrians;
}
......
......@@ -66,12 +66,9 @@ public class PotentialFieldPedestrianOSM implements PotentialFieldAgent {
@Override
public Collection<Pedestrian> getRelevantAgents(VCircle relevantArea,
Agent pedestrian, Topography scenario) {
final double maxWalkedDistanceInSimTime = 0.4 * 3; // quick fix 0.4 = simtime, 3 = max velocity.
List<Pedestrian> closePedestrians = scenario.getSpatialMap(Pedestrian.class)
return scenario.getSpatialMap(Pedestrian.class)
.getObjects(relevantArea.getCenter(),
attributes.getPedestrianRecognitionDistance() + maxWalkedDistanceInSimTime);
return closePedestrians;
attributes.getPedestrianRecognitionDistance());
}
@Override
......
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