Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
vadere
vadere
Commits
c9fafceb
Commit
c9fafceb
authored
Aug 16, 2018
by
Stefan Schuhbaeck
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into ped_overlap, fix PedestrianOverlapProcessor Test
parents
ff341e0f
8028c523
Changes
97
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
75 changed files
with
1436 additions
and
3375 deletions
+1436
-3375
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
...odelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
+0
-2494
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1_large_DISCRETE.scenario
...SM/scenarios/basic_1_chicken_osm1_large_DISCRETE.scenario
+0
-166
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1_large_NELDER_MEAD.scenario
...scenarios/basic_1_chicken_osm1_large_NELDER_MEAD.scenario
+0
-166
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1_large_PSO.scenario
...TestOSM/scenarios/basic_1_chicken_osm1_large_PSO.scenario
+0
-166
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
...odelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
...delTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
+189
-0
VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
...OSM/scenarios/corner_waiting_time_processor_test.scenario
+11
-12
VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
...estOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
+246
-0
VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok_Klon_1.scenario
...M/scenarios/narrow_passage_nelder_mead_ok_Klon_1.scenario
+246
-0
VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
...delTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
+30
-31
VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
...enarios/queueing_dynamic_floorfield_visual_check.scenario
+5
-6
VadereModelTests/TestOSM/scenarios/regular_wall_discrete_could_fail.scenario
...stOSM/scenarios/regular_wall_discrete_could_fail.scenario
+4
-5
VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
...ts/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
+11
-12
VadereModelTests/TestOSM/scenarios/rimea_01_pathway.scenario
VadereModelTests/TestOSM/scenarios/rimea_01_pathway.scenario
+5
-6
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_osm2.scenario
...delTests/TestOSM/scenarios/rimea_01_pathway_osm2.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_02_stairs_upwards_with_30_treads.scenario
...scenarios/rimea_02_stairs_upwards_with_30_treads.scenario
+7
-8
VadereModelTests/TestOSM/scenarios/rimea_03_stairs_downwards_with_30_treads.scenario
...enarios/rimea_03_stairs_downwards_with_30_treads.scenario
+7
-8
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario
VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario
+8
-9
VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
+7
-8
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_osm1.scenario
...odelTests/TestOSM/scenarios/rimea_07_speeds_osm1.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_osm1_NELDER_MEAD.scenario
...stOSM/scenarios/rimea_07_speeds_osm1_NELDER_MEAD.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_osm1_PSO.scenario
...Tests/TestOSM/scenarios/rimea_07_speeds_osm1_PSO.scenario
+3
-4
VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario
...s/TestOSM/scenarios/rimea_08_parameter_variation.scenario
+4
-5
VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits.scenario
...s/TestOSM/scenarios/rimea_09_public_room_2_exits.scenario
+32
-12
VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits.scenario
...s/TestOSM/scenarios/rimea_09_public_room_4_exits.scenario
+32
-12
VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario
...odelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario
+57
-31
VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection.scenario
...lTests/TestOSM/scenarios/rimea_11_exit_selection.scenario
+8
-8
VadereModelTests/TestOSM/scenarios/rimea_12_evacuation.scenario
...ModelTests/TestOSM/scenarios/rimea_12_evacuation.scenario
+17
-9
VadereModelTests/TestOSM/scenarios/rimea_13_stairs.scenario
VadereModelTests/TestOSM/scenarios/rimea_13_stairs.scenario
+18
-12
VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long.scenario
...odelTests/TestOSM/scenarios/rimea_13_stairs_long.scenario
+31
-25
VadereModelTests/TestOSM/scenarios/rimea_14_select_route.scenario
...delTests/TestOSM/scenarios/rimea_14_select_route.scenario
+9
-9
VadereModelTests/TestOSM/scenarios/see_small_wall_ok.scenario
...reModelTests/TestOSM/scenarios/see_small_wall_ok.scenario
+5
-6
VadereModelTests/TestOSM/scenarios/thick_wall_discrete_could_fail.scenario
...TestOSM/scenarios/thick_wall_discrete_could_fail.scenario
+4
-5
VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario
...ests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario
+164
-0
VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario
.../thin_wall_and_closer_source_discrete_could_fail.scenario
+4
-5
VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario
...arios/thin_wall_and_closer_source_nelder_mead_ok.scenario
+6
-7
VadereModelTests/TestOSM/scenarios/thin_wall_discrete_could_fail.scenario
.../TestOSM/scenarios/thin_wall_discrete_could_fail.scenario
+5
-6
VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario
...Tests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario
+164
-0
VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario
...odelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario
+2
-2
VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario
...odelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario
+2
-2
VadereModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario
...odelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario
...ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario
...ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario
...delTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario
...ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario
+2
-2
VadereModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario
...odelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario
+6
-3
VadereModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario
...odelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_2.scenario
...sts/TestSFM/scenarios/rimea_09_publicRoom_sfm1_2.scenario
+2
-2
VadereModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_4.scenario
...sts/TestSFM/scenarios/rimea_09_publicRoom_sfm1_4.scenario
+2
-2
VadereModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario
...ests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/rimea_11_exitSelection_sfm1.scenario
...ts/TestSFM/scenarios/rimea_11_exitSelection_sfm1.scenario
+2
-2
VadereModelTests/TestSFM/scenarios/rimea_12_evacuation_sfm1.scenario
...Tests/TestSFM/scenarios/rimea_12_evacuation_sfm1.scenario
+1
-1
VadereSimulator/src/org/vadere/simulator/control/OfflineTopographyController.java
...vadere/simulator/control/OfflineTopographyController.java
+2
-4
VadereSimulator/src/org/vadere/simulator/control/SourceController.java
...or/src/org/vadere/simulator/control/SourceController.java
+5
-11
No files found.
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
deleted
100644 → 0
View file @
ff341e0f
This diff is collapsed.
Click to expand it.
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1_large_DISCRETE.scenario
deleted
100644 → 0
View file @
ff341e0f
{
"name" : "basic_1_chicken_osm1_large_DISCRETE",
"description" : "",
"release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"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,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
"pedPotentialPersonalSpaceWidth" : 1.2,
"pedPotentialHeight" : 5.0,
"obstPotentialWidth" : 5.8,
"obstPotentialHeight" : 20.0,
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
}
},
"attributesSimulation" : {
"finishTime" : 200.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : false,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
},
"topography" : {
"attributes" : {
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" : 100.0,
"height" : 100.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
},
"obstacles" : [ {
"shape" : {
"x" : 16.0,
"y" : 39.8,
"width" : 5.6,
"height" : 40.3,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 21.5,
"y" : 73.1,
"width" : 45.8,
"height" : 7.0,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 60.9,
"y" : 38.4,
"width" : 6.4,
"height" : 34.7,
"type" : "RECTANGLE"
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 31.3,
"y" : 86.4,
"width" : 30.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 5.2,
"y" : 2.4,
"width" : 90.0,
"height" : 30.0,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 10000,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : false,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1_large_NELDER_MEAD.scenario
deleted
100644 → 0
View file @
ff341e0f
{
"name" : "basic_1_chicken_osm1_large_NELDER_MEAD",
"description" : "",
"release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"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" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
"pedPotentialPersonalSpaceWidth" : 1.2,
"pedPotentialHeight" : 5.0,
"obstPotentialWidth" : 5.8,
"obstPotentialHeight" : 20.0,
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
}
},
"attributesSimulation" : {
"finishTime" : 200.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : false,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
},
"topography" : {
"attributes" : {
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" : 100.0,
"height" : 100.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
},
"obstacles" : [ {
"shape" : {
"x" : 16.0,
"y" : 39.8,
"width" : 5.6,
"height" : 40.3,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 21.5,
"y" : 73.1,
"width" : 45.8,
"height" : 7.0,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 60.9,
"y" : 38.4,
"width" : 6.4,
"height" : 34.7,
"type" : "RECTANGLE"
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 31.3,
"y" : 86.4,
"width" : 30.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 5.2,
"y" : 2.4,
"width" : 90.0,
"height" : 30.0,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 10000,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : false,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1_large_PSO.scenario
deleted
100644 → 0
View file @
ff341e0f
{
"name" : "basic_1_chicken_osm1_large_PSO",
"description" : "",
"release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 10,
"numberOfCircles" : 2,
"varyStepDirection" : false,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "PSO",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
"pedPotentialPersonalSpaceWidth" : 1.2,
"pedPotentialHeight" : 5.0,
"obstPotentialWidth" : 5.8,
"obstPotentialHeight" : 20.0,
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
}
},
"attributesSimulation" : {
"finishTime" : 200.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : false,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
},
"topography" : {
"attributes" : {
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" : 100.0,
"height" : 100.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
},
"obstacles" : [ {
"shape" : {
"x" : 16.0,
"y" : 39.8,
"width" : 5.6,
"height" : 40.3,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 21.5,
"y" : 73.1,
"width" : 45.8,
"height" : 7.0,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 60.9,
"y" : 38.4,
"width" : 6.4,
"height" : 34.7,
"type" : "RECTANGLE"
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 31.3,
"y" : 86.4,
"width" : 30.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 5.2,
"y" : 2.4,
"width" : 90.0,
"height" : 30.0,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 10000,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : false,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
View file @
c9fafceb
...
...
@@ -2,7 +2,6 @@
"name" : "basic_2_density_osm1",
"description" : "",
"release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -84,7 +83,7 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" :
null
"simulationSeed" :
1
},
"topography" : {
"attributes" : {
...
...
@@ -174,6 +173,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -183,8 +183,7 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"attributesCar" : null
}
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
0 → 100644
View file @
c9fafceb
{
"name" : "chicken_floorfield_ok",
"description" : "",
"release" : "0.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTimes.txt",
"processors" : [ 2 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {