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
cc7e34d7
Commit
cc7e34d7
authored
Aug 12, 2016
by
Felix Dietrich
Browse files
Bugfix TestSFM/scenarios
parent
40206896
Changes
4
Hide whitespace changes
Inline
Side-by-side
VadereModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario
View file @
cc7e34d7
...
...
@@ -55,36 +55,26 @@
}
} ],
"vadere" : {
"mainModel" : "org.vadere.simulator.models.
osm.OptimalSteps
Model",
"mainModel" : "org.vadere.simulator.models.
sfm.SocialForce
Model",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialCompact" : {
"pedPotentialWidth" : 0.5,
"pedPotentialHeight" : 12.6,
"obstPotentialWidth" : 0.25,
"obstPotentialHeight" : 20.1,
"useHardBodyShell" : false,
"obstDistanceDeviation" : 0.0,
"visionFieldRadius" : 5.0
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
"pedestrianBodyPotential" : 2.72,
"pedestrianRecognitionDistance" : 0.3,
"obstacleBodyPotential" : 10.0,
"obstacleRepulsionStrength" : 0.2
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
"varyStepDirection" : false,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"org.vadere.state.attributes.models.AttributesSFM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EIKONAL_DISCRETE",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianOSM",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleOSM",
"groupModel" : "",
"submodels" : [ ]
"pedestrianPotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldPedestrianSFM",
"obstaclePotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldObstacleSFM"
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
...
...
VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario
View file @
cc7e34d7
...
...
@@ -25,36 +25,26 @@
}
} ],
"vadere" : {
"mainModel" : "org.vadere.simulator.models.
osm.OptimalSteps
Model",
"mainModel" : "org.vadere.simulator.models.
sfm.SocialForce
Model",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialCompact" : {
"pedPotentialWidth" : 0.5,
"pedPotentialHeight" : 12.6,
"obstPotentialWidth" : 0.25,
"obstPotentialHeight" : 20.1,
"useHardBodyShell" : false,
"obstDistanceDeviation" : 0.0,
"visionFieldRadius" : 5.0
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
"pedestrianBodyPotential" : 2.72,
"pedestrianRecognitionDistance" : 0.3,
"obstacleBodyPotential" : 10.0,
"obstacleRepulsionStrength" : 0.2
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 30,
"numberOfCircles" : 4,
"varyStepDirection" : true,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"org.vadere.state.attributes.models.AttributesSFM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EIKONAL_DISCRETE",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianOSM",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleOSM",
"groupModel" : "",
"submodels" : [ ]
"pedestrianPotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldPedestrianSFM",
"obstaclePotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldObstacleSFM"
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
...
...
VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario
View file @
cc7e34d7
...
...
@@ -25,36 +25,26 @@
}
} ],
"vadere" : {
"mainModel" : "org.vadere.simulator.models.
osm.OptimalSteps
Model",
"mainModel" : "org.vadere.simulator.models.
sfm.SocialForce
Model",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialCompact" : {
"pedPotentialWidth" : 0.5,
"pedPotentialHeight" : 12.6,
"obstPotentialWidth" : 0.25,
"obstPotentialHeight" : 20.1,
"useHardBodyShell" : false,
"obstDistanceDeviation" : 0.0,
"visionFieldRadius" : 5.0
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
"pedestrianBodyPotential" : 2.72,
"pedestrianRecognitionDistance" : 0.3,
"obstacleBodyPotential" : 10.0,
"obstacleRepulsionStrength" : 0.2
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 30,
"numberOfCircles" : 4,
"varyStepDirection" : true,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"org.vadere.state.attributes.models.AttributesSFM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EIKONAL_DISCRETE",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianOSM",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleOSM",
"groupModel" : "",
"submodels" : [ ]
"pedestrianPotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldPedestrianSFM",
"obstaclePotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldObstacleSFM"
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
...
...
VadereModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario
View file @
cc7e34d7
...
...
@@ -55,36 +55,26 @@
}
} ],
"vadere" : {
"mainModel" : "org.vadere.simulator.models.
osm.OptimalSteps
Model",
"mainModel" : "org.vadere.simulator.models.
sfm.SocialForce
Model",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesPotentialCompact" : {
"pedPotentialWidth" : 0.5,
"pedPotentialHeight" : 12.6,
"obstPotentialWidth" : 0.25,
"obstPotentialHeight" : 20.1,
"useHardBodyShell" : false,
"obstDistanceDeviation" : 0.0,
"visionFieldRadius" : 5.0
"org.vadere.state.attributes.models.AttributesPotentialSFM" : {
"pedestrianBodyPotential" : 2.72,
"pedestrianRecognitionDistance" : 0.3,
"obstacleBodyPotential" : 10.0,
"obstacleRepulsionStrength" : 0.2
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
"varyStepDirection" : true,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"org.vadere.state.attributes.models.AttributesSFM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EIKONAL_DISCRETE",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianOSM",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleOSM",
"groupModel" : "",
"submodels" : [ ]
"pedestrianPotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldPedestrianSFM",
"obstaclePotentialModel" : "org.vadere.simulator.models.sfm.PotentialFieldObstacleSFM"
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
...
...
Write
Preview
Markdown
is supported
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