The name of the initial branch for new projects is now "main" instead of "master". Existing projects remain unchanged. More information: https://doku.lrz.de/display/PUBLIC/GitLab

Commit deec92bf authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

change the default OSM parameter to those suggested by isabella (from her diss).

parent 5e04b527
......@@ -21,6 +21,7 @@ import org.vadere.state.attributes.models.AttributesGNM;
import org.vadere.state.attributes.models.AttributesOSM;
import org.vadere.state.attributes.models.AttributesOVM;
import org.vadere.state.attributes.models.AttributesPotentialCompact;
import org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell;
import org.vadere.state.attributes.models.AttributesPotentialGNM;
import org.vadere.state.attributes.models.AttributesPotentialSFM;
import org.vadere.state.attributes.models.AttributesReynolds;
......@@ -48,7 +49,7 @@ public class ModelPresets {
// Optimal Steps Model
list.clear();
list.add(AttributesOSM.class);
list.add(AttributesPotentialCompact.class);
list.add(AttributesPotentialCompactSoftshell.class);
list.add(AttributesFloorField.class);
registerModelPreset(OptimalStepsModel.class, list);
......
......@@ -25,8 +25,8 @@ public class AttributesOSM extends Attributes {
private boolean seeSmallWalls = false;
private boolean minimumStepLength = false;
private String targetPotentialModel = "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid";
private String pedestrianPotentialModel = "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact";
private String obstaclePotentialModel = "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact";
private String pedestrianPotentialModel = "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell";
private String obstaclePotentialModel = "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell";
private List<String> submodels = new LinkedList<>();
public AttributesOSM() {}
......
......@@ -6,13 +6,12 @@ public class AttributesPotentialCompactSoftshell extends Attributes {
private double pedPotentialIntimateSpaceWidth = 0.45;
private double pedPotentialPersonalSpaceWidth = 1.20;
private double pedPotentialHeight = 6.0;
private double pedPotentialHeight = 50.0;
private double obstPotentialWidth = 0.8;
private double obstPotentialHeight = 3.0;
private double intimateSpaceFactor = 3.0;
private double obstPotentialHeight = 6.0;
private double intimateSpaceFactor = 1.2;
private int personalSpacePower = 1;
private int intimateSpacePower = 3;
private int intimateSpacePower = 1;
public int getIntimateSpacePower() {
return intimateSpacePower;
......
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