From e2fb620885708eccb4af223213fcf809747b14ed Mon Sep 17 00:00:00 2001 From: hm-schuhba1 Date: Thu, 10 Jan 2019 14:22:30 +0100 Subject: [PATCH] rearrange key-Value pairs in scenario files due to release 0.7 --- ..._sources_2_targets_osm_sequential.scenario | 38 ++++----- ...rea_event_2_sources_2_targets_bhm.scenario | 46 +++++------ ..._sources_2_targets_osm_sequential.scenario | 52 ++++++------- .../basic_2_density_discrete_ca.scenario | 15 ++-- .../scenarios/basic_2_density_pso.scenario | 15 ++-- .../chicken_floorfield_displaced_ok.scenario | 15 ++-- .../scenarios/chicken_floorfield_ok.scenario | 15 ++-- ...orner_waiting_time_processor_test.scenario | 36 +++++---- .../narrow_passage_discrete_CA_fail.scenario | 77 +++++++++++-------- .../narrow_passage_nelder_mead_ok.scenario | 77 +++++++++++-------- .../scenarios/narrow_passage_pso_ok.scenario | 77 +++++++++++-------- ...g_dynamic_floorfield_visual_check.scenario | 15 ++-- .../regular_wall_discrete_ok.scenario | 15 ++-- .../regular_wall_nelder_mead_ok.scenario | 15 ++-- .../scenarios/regular_wall_pso_ok.scenario | 15 ++-- ...a_01_pathway_discrete_brute_force.scenario | 15 ++-- .../rimea_01_pathway_discrete_ca.scenario | 15 ++-- .../rimea_04_flow_osm1_025_d.scenario | 15 ++-- .../rimea_04_flow_osm1_025_up.scenario | 15 ++-- .../rimea_04_flow_osm1_050_d.scenario | 15 ++-- .../rimea_04_flow_osm1_050_up.scenario | 15 ++-- .../rimea_04_flow_osm1_075_d.scenario | 15 ++-- .../rimea_04_flow_osm1_075_up.scenario | 15 ++-- .../rimea_04_flow_osm1_100_d.scenario | 15 ++-- .../rimea_04_flow_osm1_100_up.scenario | 15 ++-- .../rimea_04_flow_osm1_125_d.scenario | 15 ++-- .../rimea_04_flow_osm1_125_up.scenario | 15 ++-- .../rimea_04_flow_osm1_550_up.scenario | 15 ++-- .../TestOSM/scenarios/rimea_05_react.scenario | 15 ++-- .../scenarios/rimea_06_corner.scenario | 15 ++-- .../rimea_07_speeds_discrete_ca.scenario | 15 ++-- .../rimea_07_speeds_nelder_mead.scenario | 15 ++-- .../scenarios/rimea_07_speeds_pso.scenario | 15 ++-- .../rimea_08_parameter_variation.scenario | 15 ++-- ...9_public_room_2_exits_nelder_mead.scenario | 15 ++-- .../rimea_09_public_room_2_exits_pso.scenario | 15 ++-- ...9_public_room_4_exits_nelder_mead.scenario | 15 ++-- .../rimea_09_public_room_4_exits_pso.scenario | 15 ++-- .../scenarios/rimea_10_pathfinding.scenario | 15 ++-- ...mea_11_exit_selection_nelder_mead.scenario | 15 ++-- .../rimea_11_exit_selection_pso.scenario | 15 ++-- .../rimea_12_evacuation_nelder_mead.scenario | 15 ++-- .../rimea_12_evacuation_pso.scenario | 15 ++-- .../rimea_13_stairs_long_nelder_mead.scenario | 15 ++-- .../rimea_13_stairs_long_pso.scenario | 15 ++-- .../rimea_13_stairs_nelder_mead.scenario | 15 ++-- .../scenarios/rimea_13_stairs_pso.scenario | 15 ++-- ...rimea_14_select_route_nelder_mead.scenario | 15 ++-- .../rimea_14_select_route_pso.scenario | 15 ++-- .../see_small_wall_nelder_mead_ok.scenario | 15 ++-- .../see_small_wall_pso_fail.scenario | 15 ++-- .../scenarios/thick_wall_discrete_ok.scenario | 15 ++-- .../thick_wall_nelder_mead_ok.scenario | 15 ++-- .../scenarios/thick_wall_pso_ok.scenario | 15 ++-- ...closer_source_discrete_could_fail.scenario | 15 ++-- ..._and_closer_source_nelder_mead_ok.scenario | 15 ++-- ..._and_closer_source_pso_could_fail.scenario | 15 ++-- .../scenarios/thin_wall_discrete_ok.scenario | 15 ++-- .../thin_wall_nelder_mead_ok.scenario | 15 ++-- .../scenarios/thin_wall_pso_ok.scenario | 15 ++-- 60 files changed, 645 insertions(+), 553 deletions(-) diff --git a/VadereModelTests/TestEvents/scenarios/wait_event_2_sources_2_targets_osm_sequential.scenario b/VadereModelTests/TestEvents/scenarios/wait_event_2_sources_2_targets_osm_sequential.scenario index 0906b84fd..658068dcf 100644 --- a/VadereModelTests/TestEvents/scenarios/wait_event_2_sources_2_targets_osm_sequential.scenario +++ b/VadereModelTests/TestEvents/scenarios/wait_event_2_sources_2_targets_osm_sequential.scenario @@ -2,7 +2,6 @@ "name" : "wait_event_2_sources_2_targets_osm_sequential", "description" : "", "release" : "0.7", - "commithash" : "45917996dc1d7ac7f31aff96d40e2886d36a5cd3", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -80,6 +79,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -89,9 +90,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -116,18 +115,6 @@ "fixedSeed" : 1, "simulationSeed" : 1 }, - "eventInfos" : [ { - "eventTimeframe" : { - "startTime" : 10.0, - "endTime" : 60.0, - "repeat" : false, - "waitTimeBetweenRepetition" : 0.0 - }, - "events" : [ { - "type" : "WaitEvent", - "targets" : [ ] - } ] - } ], "topography" : { "attributes" : { "bounds" : { @@ -217,6 +204,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -226,8 +214,20 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ { + "eventTimeframe" : { + "startTime" : 10.0, + "endTime" : 60.0, + "repeat" : false, + "waitTimeBetweenRepetition" : 0.0 + }, + "events" : [ { + "type" : "WaitEvent", + "targets" : [ ] + } ] + } ] } } \ No newline at end of file diff --git a/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_bhm.scenario b/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_bhm.scenario index 2e7ac9713..c689c27b5 100644 --- a/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_bhm.scenario +++ b/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_bhm.scenario @@ -2,7 +2,6 @@ "name" : "wait_in_area_event_2_sources_2_targets_bhm", "description" : "", "release" : "0.7", - "commithash" : "45917996dc1d7ac7f31aff96d40e2886d36a5cd3", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -104,25 +103,6 @@ "fixedSeed" : 1, "simulationSeed" : 1 }, - "eventInfos" : [ { - "eventTimeframe" : { - "startTime" : 10.0, - "endTime" : 60.0, - "repeat" : false, - "waitTimeBetweenRepetition" : 0.0 - }, - "events" : [ { - "type" : "WaitInAreaEvent", - "targets" : [ ], - "area" : { - "x" : 15.0, - "y" : 0.0, - "width" : 6.0, - "height" : 8.0, - "type" : "RECTANGLE" - } - } ] - } ], "topography" : { "attributes" : { "bounds" : { @@ -212,6 +192,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -221,8 +202,27 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ { + "eventTimeframe" : { + "startTime" : 10.0, + "endTime" : 60.0, + "repeat" : false, + "waitTimeBetweenRepetition" : 0.0 + }, + "events" : [ { + "type" : "WaitInAreaEvent", + "targets" : [ ], + "area" : { + "x" : 15.0, + "y" : 0.0, + "width" : 6.0, + "height" : 8.0, + "type" : "RECTANGLE" + } + } ] + } ] } } \ No newline at end of file diff --git a/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_osm_sequential.scenario b/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_osm_sequential.scenario index 8acbdb9a1..bc6648cc4 100644 --- a/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_osm_sequential.scenario +++ b/VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_osm_sequential.scenario @@ -2,7 +2,6 @@ "name" : "wait_in_area_event_2_sources_2_targets_osm_sequential", "description" : "", "release" : "0.7", - "commithash" : "45917996dc1d7ac7f31aff96d40e2886d36a5cd3", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -80,6 +79,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -89,9 +90,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -116,25 +115,6 @@ "fixedSeed" : 1, "simulationSeed" : 1 }, - "eventInfos" : [ { - "eventTimeframe" : { - "startTime" : 10.0, - "endTime" : 60.0, - "repeat" : false, - "waitTimeBetweenRepetition" : 0.0 - }, - "events" : [ { - "type" : "WaitInAreaEvent", - "targets" : [ ], - "area" : { - "x" : 15.0, - "y" : 0.0, - "width" : 6.0, - "height" : 8.0, - "type" : "RECTANGLE" - } - } ] - } ], "topography" : { "attributes" : { "bounds" : { @@ -224,6 +204,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -233,8 +214,27 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ { + "eventTimeframe" : { + "startTime" : 10.0, + "endTime" : 60.0, + "repeat" : false, + "waitTimeBetweenRepetition" : 0.0 + }, + "events" : [ { + "type" : "WaitInAreaEvent", + "targets" : [ ], + "area" : { + "x" : 15.0, + "y" : 0.0, + "width" : 6.0, + "height" : 8.0, + "type" : "RECTANGLE" + } + } ] + } ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario b/VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario index f3d8b255d..41c7559c1 100644 --- a/VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario +++ b/VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario @@ -2,7 +2,6 @@ "name" : "basic_2_density_discrete_ca", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -80,6 +79,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -89,9 +90,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -204,6 +203,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -213,8 +213,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario b/VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario index 44f0ac06b..38637d723 100644 --- a/VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario @@ -2,7 +2,6 @@ "name" : "basic_2_density_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -68,6 +67,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -77,9 +78,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -192,6 +191,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -201,8 +201,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario b/VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario index 0b6d64ef9..03fd257ba 100644 --- a/VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario @@ -2,7 +2,6 @@ "name" : "chicken_floorfield_displaced_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -85,6 +84,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -94,9 +95,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -200,6 +199,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -209,8 +209,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario b/VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario index 1bca6857f..81ae2fe70 100644 --- a/VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario @@ -2,7 +2,6 @@ "name" : "chicken_floorfield_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -95,6 +94,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -104,9 +105,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -210,6 +209,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -219,8 +219,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario b/VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario index abbec68b9..3db0cd215 100644 --- a/VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario +++ b/VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario @@ -2,7 +2,6 @@ "name" : "corner_waiting_time_processor_test", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -95,6 +94,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -104,9 +105,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -201,15 +200,6 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], - "attributesPedestrian" : { - "radius" : 0.195, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.26, - "minimumSpeed" : 0.5, - "maximumSpeed" : 2.2, - "acceleration" : 2.0 - }, "dynamicElements" : [ { "source" : null, "targetIds" : [ 1 ], @@ -234,13 +224,29 @@ "acceleration" : 2.0 }, "idAsTarget" : -1, - "modelPedestrianMap" : { }, "isChild" : false, "isLikelyInjured" : false, + "mostImportantEvent" : null, "groupIds" : [ ], + "trajectory" : { + "footSteps" : [ ] + }, + "groupSizes" : [ ], + "modelPedestrianMap" : { }, "type" : "PEDESTRIAN" } ], + "attributesPedestrian" : { + "radius" : 0.195, + "densityDependentSpeed" : false, + "speedDistributionMean" : 1.34, + "speedDistributionStandardDeviation" : 0.26, + "minimumSpeed" : 0.5, + "maximumSpeed" : 2.2, + "acceleration" : 2.0 + }, + "teleporter" : null, "attributesCar" : null - } + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario b/VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario index 06961fffa..5efa3a754 100644 --- a/VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario +++ b/VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario @@ -2,7 +2,6 @@ "name" : "narrow_passage_discrete_CA_fail", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -71,6 +70,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -80,9 +81,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -327,31 +326,7 @@ "startingWithRedLight" : false, "nextSpeed" : -1.0 } ], - "attributesPedestrian" : { - "radius" : 0.195, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.0, - "minimumSpeed" : 0.3, - "maximumSpeed" : 3.0, - "acceleration" : 2.0 - }, - "attributesCar" : { - "id" : -1, - "radius" : 0.195, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.0, - "minimumSpeed" : 0.3, - "maximumSpeed" : 3.0, - "acceleration" : 2.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - }, + "sources" : [ ], "dynamicElements" : [ { "source" : null, "targetIds" : [ 1 ], @@ -376,10 +351,15 @@ "acceleration" : 2.0 }, "idAsTarget" : -1, - "modelPedestrianMap" : { }, "isChild" : false, "isLikelyInjured" : false, + "mostImportantEvent" : null, "groupIds" : [ ], + "trajectory" : { + "footSteps" : [ ] + }, + "groupSizes" : [ ], + "modelPedestrianMap" : { }, "type" : "PEDESTRIAN" }, { "source" : null, @@ -405,13 +385,44 @@ "acceleration" : 2.0 }, "idAsTarget" : -1, - "modelPedestrianMap" : { }, "isChild" : false, "isLikelyInjured" : false, + "mostImportantEvent" : null, "groupIds" : [ ], + "trajectory" : { + "footSteps" : [ ] + }, + "groupSizes" : [ ], + "modelPedestrianMap" : { }, "type" : "PEDESTRIAN" } ], - "sources" : [ ] - } + "attributesPedestrian" : { + "radius" : 0.195, + "densityDependentSpeed" : false, + "speedDistributionMean" : 1.34, + "speedDistributionStandardDeviation" : 0.0, + "minimumSpeed" : 0.3, + "maximumSpeed" : 3.0, + "acceleration" : 2.0 + }, + "teleporter" : null, + "attributesCar" : { + "id" : -1, + "radius" : 0.195, + "densityDependentSpeed" : false, + "speedDistributionMean" : 1.34, + "speedDistributionStandardDeviation" : 0.0, + "minimumSpeed" : 0.3, + "maximumSpeed" : 3.0, + "acceleration" : 2.0, + "length" : 4.5, + "width" : 1.7, + "direction" : { + "x" : 1.0, + "y" : 0.0 + } + } + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario b/VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario index 0107b9317..fe91004ca 100644 --- a/VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario @@ -2,7 +2,6 @@ "name" : "narrow_passage_nelder_mead_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -87,6 +86,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -96,9 +97,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -271,31 +270,7 @@ "startingWithRedLight" : false, "nextSpeed" : -1.0 } ], - "attributesPedestrian" : { - "radius" : 0.195, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.0, - "minimumSpeed" : 0.3, - "maximumSpeed" : 3.0, - "acceleration" : 2.0 - }, - "attributesCar" : { - "id" : -1, - "radius" : 0.195, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.0, - "minimumSpeed" : 0.3, - "maximumSpeed" : 3.0, - "acceleration" : 2.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - }, + "sources" : [ ], "dynamicElements" : [ { "source" : null, "targetIds" : [ 1 ], @@ -320,10 +295,15 @@ "acceleration" : 2.0 }, "idAsTarget" : -1, - "modelPedestrianMap" : { }, "isChild" : false, "isLikelyInjured" : false, + "mostImportantEvent" : null, "groupIds" : [ ], + "trajectory" : { + "footSteps" : [ ] + }, + "groupSizes" : [ ], + "modelPedestrianMap" : { }, "type" : "PEDESTRIAN" }, { "source" : null, @@ -349,13 +329,44 @@ "acceleration" : 2.0 }, "idAsTarget" : -1, - "modelPedestrianMap" : { }, "isChild" : false, "isLikelyInjured" : false, + "mostImportantEvent" : null, "groupIds" : [ ], + "trajectory" : { + "footSteps" : [ ] + }, + "groupSizes" : [ ], + "modelPedestrianMap" : { }, "type" : "PEDESTRIAN" } ], - "sources" : [ ] - } + "attributesPedestrian" : { + "radius" : 0.195, + "densityDependentSpeed" : false, + "speedDistributionMean" : 1.34, + "speedDistributionStandardDeviation" : 0.0, + "minimumSpeed" : 0.3, + "maximumSpeed" : 3.0, + "acceleration" : 2.0 + }, + "teleporter" : null, + "attributesCar" : { + "id" : -1, + "radius" : 0.195, + "densityDependentSpeed" : false, + "speedDistributionMean" : 1.34, + "speedDistributionStandardDeviation" : 0.0, + "minimumSpeed" : 0.3, + "maximumSpeed" : 3.0, + "acceleration" : 2.0, + "length" : 4.5, + "width" : 1.7, + "direction" : { + "x" : 1.0, + "y" : 0.0 + } + } + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario b/VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario index 4ee959001..b70607b67 100644 --- a/VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario @@ -2,7 +2,6 @@ "name" : "narrow_passage_pso_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -87,6 +86,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -96,9 +97,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -559,31 +558,7 @@ "startingWithRedLight" : false, "nextSpeed" : -1.0 } ], - "attributesPedestrian" : { - "radius" : 0.195, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.0, - "minimumSpeed" : 0.3, - "maximumSpeed" : 3.0, - "acceleration" : 2.0 - }, - "attributesCar" : { - "id" : -1, - "radius" : 0.195, - "densityDependentSpeed" : false, - "speedDistributionMean" : 1.34, - "speedDistributionStandardDeviation" : 0.0, - "minimumSpeed" : 0.3, - "maximumSpeed" : 3.0, - "acceleration" : 2.0, - "length" : 4.5, - "width" : 1.7, - "direction" : { - "x" : 1.0, - "y" : 0.0 - } - }, + "sources" : [ ], "dynamicElements" : [ { "source" : null, "targetIds" : [ 1 ], @@ -608,10 +583,15 @@ "acceleration" : 2.0 }, "idAsTarget" : -1, - "modelPedestrianMap" : { }, "isChild" : false, "isLikelyInjured" : false, + "mostImportantEvent" : null, "groupIds" : [ ], + "trajectory" : { + "footSteps" : [ ] + }, + "groupSizes" : [ ], + "modelPedestrianMap" : { }, "type" : "PEDESTRIAN" }, { "source" : null, @@ -637,13 +617,44 @@ "acceleration" : 2.0 }, "idAsTarget" : -1, - "modelPedestrianMap" : { }, "isChild" : false, "isLikelyInjured" : false, + "mostImportantEvent" : null, "groupIds" : [ ], + "trajectory" : { + "footSteps" : [ ] + }, + "groupSizes" : [ ], + "modelPedestrianMap" : { }, "type" : "PEDESTRIAN" } ], - "sources" : [ ] - } + "attributesPedestrian" : { + "radius" : 0.195, + "densityDependentSpeed" : false, + "speedDistributionMean" : 1.34, + "speedDistributionStandardDeviation" : 0.0, + "minimumSpeed" : 0.3, + "maximumSpeed" : 3.0, + "acceleration" : 2.0 + }, + "teleporter" : null, + "attributesCar" : { + "id" : -1, + "radius" : 0.195, + "densityDependentSpeed" : false, + "speedDistributionMean" : 1.34, + "speedDistributionStandardDeviation" : 0.0, + "minimumSpeed" : 0.3, + "maximumSpeed" : 3.0, + "acceleration" : 2.0, + "length" : 4.5, + "width" : 1.7, + "direction" : { + "x" : 1.0, + "y" : 0.0 + } + } + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario b/VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario index 282b96583..2b14ad759 100644 --- a/VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario +++ b/VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario @@ -2,7 +2,6 @@ "name" : "queueing_dynamic_floorfield_visual_check", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -63,6 +62,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -72,9 +73,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompact" : { "pedPotentialWidth" : 0.5, @@ -168,6 +167,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -177,6 +177,7 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, + "teleporter" : null, "attributesCar" : { "id" : -1, "radius" : 0.195, @@ -192,8 +193,8 @@ "x" : 1.0, "y" : 0.0 } - }, - "dynamicElements" : [ ] - } + } + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario b/VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario index 45e0670ea..2ece5eb5d 100644 --- a/VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario @@ -2,7 +2,6 @@ "name" : "regular_wall_discrete_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -84,6 +83,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -93,9 +94,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -253,6 +252,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -262,8 +262,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario b/VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario index 7788f9b24..be3a87df8 100644 --- a/VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario @@ -2,7 +2,6 @@ "name" : "regular_wall_nelder_mead_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -84,6 +83,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -93,9 +94,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -253,6 +252,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -262,8 +262,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario b/VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario index b915b3f08..3c5330764 100644 --- a/VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario @@ -2,7 +2,6 @@ "name" : "regular_wall_pso_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -84,6 +83,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -93,9 +94,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -181,6 +180,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -190,8 +190,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario b/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario index f62213c64..f1c9f06d4 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario @@ -2,7 +2,6 @@ "name" : "rimea_01_pathway_discrete_brute_force", "description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -88,6 +87,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -97,9 +98,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -320,6 +319,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -329,8 +329,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario b/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario index bb50bd58d..fd2b60679 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario @@ -2,7 +2,6 @@ "name" : "rimea_01_pathway_discrete_ca", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -88,6 +87,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -97,9 +98,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -320,6 +319,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -329,8 +329,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario index f162e5e9b..e2f8bf46e 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_025_d", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario index 68dd53d08..15fdcc4f5 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_025_up", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario index f3ca9f00b..8b637233b 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_050_d", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario index 533225583..b50be41f0 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_050_up", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario index 8bddd7e33..7e18d9e0b 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_075_d", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario index 7c9affc13..205333f65 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_075_up", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario index f640aa90a..7ca52cc1a 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_100_d", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario index 1bd84e188..f118c365c 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_100_up", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario index 100e8580a..528318483 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_125_d", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario index 49357d516..ff0947810 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_125_up", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario index dc29736c5..7f55bbe85 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario @@ -2,7 +2,6 @@ "name" : "rimea_04_flow_osm1_550_up", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -155,6 +154,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -164,8 +164,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario b/VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario index 88b7a159d..970f4acdd 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario @@ -2,7 +2,6 @@ "name" : "rimea_05_react", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -159,6 +158,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -168,8 +168,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario b/VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario index 5190c7501..ec1bd8d2b 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario @@ -2,7 +2,6 @@ "name" : "rimea_06_corner", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -105,6 +104,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -114,9 +115,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -211,6 +210,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -220,8 +220,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario b/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario index 404a3513d..9eff0379f 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario @@ -2,7 +2,6 @@ "name" : "rimea_07_speeds_discrete_ca", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -88,6 +87,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -97,9 +98,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -176,6 +175,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -185,8 +185,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario index 55649665f..69af6de98 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_07_speeds_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -88,6 +87,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -97,9 +98,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -176,6 +175,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -185,8 +185,9 @@ "maximumSpeed" : 2.0, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario index b386acccf..c9e38b6b8 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_07_speeds_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -88,6 +87,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "DIRECTIONAL", "dynamicStepLength" : false, @@ -97,9 +98,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -464,6 +463,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -473,8 +473,9 @@ "maximumSpeed" : 2.0, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario b/VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario index 404d3abe9..e77a17b94 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario @@ -2,7 +2,6 @@ "name" : "rimea_08_parameter_variation", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -3122,6 +3121,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -3131,8 +3131,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario index ebf922dba..6afffdb08 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_09_public_room_2_exits_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -95,6 +94,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -104,9 +105,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -276,6 +275,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -285,8 +285,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario index 7d32ea051..bdc7bc4b3 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_09_public_room_2_exits_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -95,6 +94,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -104,9 +105,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -276,6 +275,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -285,8 +285,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario index 58c06ec6b..2d9880082 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_09_public_room_4_exits_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -95,6 +94,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -104,9 +105,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -267,6 +266,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -276,8 +276,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario index 178d5385e..2385636cc 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_09_public_room_4_exits_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -95,6 +94,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -104,9 +105,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -267,6 +266,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -276,8 +276,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario b/VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario index 4344bd907..271a2950f 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario @@ -2,7 +2,6 @@ "name" : "rimea_10_pathfinding", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -821,6 +820,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -830,8 +830,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario index 37c478446..49ada5c4b 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_11_exit_selection_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -213,6 +212,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -222,8 +222,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario index 159517b29..c35bbfc54 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_11_exit_selection_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -213,6 +212,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -222,8 +222,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario index aaf00077c..612844744 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_12_evacuation_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompact" : { "pedPotentialWidth" : 0.5, @@ -186,6 +185,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -195,8 +195,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario index b79a48911..f98038841 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_12_evacuation_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ ], "processors" : [ { @@ -53,6 +52,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -62,9 +63,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompact" : { "pedPotentialWidth" : 0.5, @@ -186,6 +185,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -195,8 +195,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario index 99da5ab45..b9726d478 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_13_stairs_long_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -60,6 +59,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -69,9 +70,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -180,6 +179,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -189,8 +189,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario index a1550f94b..9f6639785 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_13_stairs_long_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -60,6 +59,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -69,9 +70,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -180,6 +179,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -189,8 +189,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario index 17fd146bc..54f9c6783 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_13_stairs_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -60,6 +59,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -69,9 +70,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -180,6 +179,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -189,8 +189,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario index d5d90f1b1..dd2e50cec 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_13_stairs_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -60,6 +59,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -69,9 +70,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -180,6 +179,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -189,8 +189,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario b/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario index b56d9a17f..2e8a90301 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario @@ -2,7 +2,6 @@ "name" : "rimea_14_select_route_nelder_mead", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -60,6 +59,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -69,9 +70,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -230,6 +229,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -239,8 +239,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario b/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario index 5e8878bb2..b211beee8 100644 --- a/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario +++ b/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario @@ -2,7 +2,6 @@ "name" : "rimea_14_select_route_pso", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -60,6 +59,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -69,9 +70,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -230,6 +229,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -239,8 +239,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario b/VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario index 82a395bdf..496d8ce87 100644 --- a/VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario @@ -2,7 +2,6 @@ "name" : "see_small_wall_nelder_mead_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario b/VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario index c7c1894e7..5efecd82a 100644 --- a/VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario +++ b/VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario @@ -2,7 +2,6 @@ "name" : "see_small_wall_pso_fail", "description" : "The particle swarm optimizer does not use the attribute seeSmallWalls.", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "PSO", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario b/VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario index b7d2ed11a..20b09bdc9 100644 --- a/VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario @@ -2,7 +2,6 @@ "name" : "thick_wall_discrete_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario b/VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario index c3210eb56..b472aee73 100644 --- a/VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario @@ -2,7 +2,6 @@ "name" : "thick_wall_nelder_mead_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario b/VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario index 6322ecf44..c2c8db6b5 100644 --- a/VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario @@ -2,7 +2,6 @@ "name" : "thick_wall_pso_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario b/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario index 39a122002..28db1deab 100644 --- a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario +++ b/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario @@ -2,7 +2,6 @@ "name" : "thin_wall_and_closer_source_discrete_could_fail", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario b/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario index 279ce0589..806647d19 100644 --- a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario @@ -2,7 +2,6 @@ "name" : "thin_wall_and_closer_source_nelder_mead_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario b/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario index 6501c3d8a..620cf0cbc 100644 --- a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario +++ b/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario @@ -2,7 +2,6 @@ "name" : "thin_wall_and_closer_source_pso_could_fail", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario b/VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario index 085c40019..78c26900a 100644 --- a/VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario @@ -2,7 +2,6 @@ "name" : "thin_wall_discrete_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "DISCRETE", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario b/VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario index e1869235e..b4aa6e9e2 100644 --- a/VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario @@ -2,7 +2,6 @@ "name" : "thin_wall_nelder_mead_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario b/VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario index 1003dbf32..3fd98b616 100644 --- a/VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario +++ b/VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario @@ -2,7 +2,6 @@ "name" : "thin_wall_pso_ok", "description" : "", "release" : "0.7", - "commithash" : "warning: no commit hash", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -91,6 +90,8 @@ "stepLengthSlopeSpeed" : 0.2345, "stepLengthSD" : 0.036, "movementThreshold" : 0.0, + "minStepLength" : 0.4625, + "maxStepDuration" : 1.7976931348623157E308, "optimizationType" : "NELDER_MEAD", "movementType" : "ARBITRARY", "dynamicStepLength" : false, @@ -100,9 +101,7 @@ "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", - "submodels" : [ ], - "minStepLength" : "0.4625", - "maxStepDuration" : "1.7976931348623157E308" + "submodels" : [ ] }, "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "pedPotentialIntimateSpaceWidth" : 0.45, @@ -188,6 +187,7 @@ "groupSizeDistribution" : [ 1.0 ], "dynamicElementType" : "PEDESTRIAN" } ], + "dynamicElements" : [ ], "attributesPedestrian" : { "radius" : 0.195, "densityDependentSpeed" : false, @@ -197,8 +197,9 @@ "maximumSpeed" : 2.2, "acceleration" : 2.0 }, - "attributesCar" : null, - "dynamicElements" : [ ] - } + "teleporter" : null, + "attributesCar" : null + }, + "eventInfos" : [ ] } } \ No newline at end of file -- GitLab