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
deec92bf
Commit
deec92bf
authored
Mar 30, 2018
by
Benedikt Zoennchen
Browse files
change the default OSM parameter to those suggested by isabella (from her diss).
parent
5e04b527
Changes
3
Hide whitespace changes
Inline
Side-by-side
VadereGui/src/org/vadere/gui/projectview/view/ModelPresets.java
View file @
deec92bf
...
...
@@ -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
(
AttributesPotentialCompact
Softshell
.
class
);
list
.
add
(
AttributesFloorField
.
class
);
registerModelPreset
(
OptimalStepsModel
.
class
,
list
);
...
...
VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java
View file @
deec92bf
...
...
@@ -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.PotentialFieldPedestrianCompact
Softshell
"
;
private
String
obstaclePotentialModel
=
"org.vadere.simulator.models.potential.PotentialFieldObstacleCompact
Softshell
"
;
private
List
<
String
>
submodels
=
new
LinkedList
<>();
public
AttributesOSM
()
{}
...
...
VadereState/src/org/vadere/state/attributes/models/AttributesPotentialCompactSoftshell.java
View file @
deec92bf
...
...
@@ -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
;
...
...
Write
Preview
Supports
Markdown
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