04.07., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit bcd1d449 authored by BZoennchen's avatar BZoennchen

add modified T-junction scenario calibrated via evacuation times which we used...

add modified T-junction scenario calibrated via evacuation times which we used for the tgf2019 vadere paper, remove T-junction experiment data (they can be found on our nextcloud).
parent fd910ca2
This diff is collapsed.
......@@ -153,6 +153,9 @@ public class PedestrianOSM extends Pedestrian {
if(attributesOSM.isMinimumStepLength() && getPosition().distance(nextPosition) < minStepLength) {
nextPosition = getPosition();
}
/*else if(potentialFieldTarget.getPotential(nextPosition, this) >= potentialFieldTarget.getPotential(getPosition(), this)) {
nextPosition = getPosition();
}*/
} else {
stairStepOptimizer = new StairStepOptimizer(stairs);
......
......@@ -62,7 +62,8 @@ public class StepCircleOptimizerDiscrete implements StepCircleOptimizer {
}
if (curPosPotential - potential <= movementThreshold) {
// pedestrian.getTargetPotential(nextPos) > 0 => agent is not jet on his target otherwise the agent would wait forever
if (curPosPotential - potential <= movementThreshold && pedestrian.getTargetPotential(nextPos) > 0) {
nextPos = curPos;
}
......
......@@ -28,7 +28,12 @@ public class TimeCostFunctionObstacleDistance implements ITimeCostFunction {
public double costAt(IPoint p) {
double timeCost = timeCostFunction.costAt(p);
double distance = obstacleDistanceFunction.apply(p);
if(distance > 0 && distance < width) {
if(distance <= 0) {
timeCost += height;
}
else if(distance > 0 && distance < width) {
//timeCost += height * Math.exp(2 / (Math.pow(distance / (width), 2) - 1));
timeCost += (1-(distance/ width)) * height;
}
return timeCost;
......
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