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 0906b84fdeeda18ccd87aac6ee8cea1defb2e532..658068dcff4642f3d9d355f84409dfd99f340768 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 2e7ac97131ad85ade58147e4d5daa3d4b7369e8e..c689c27b572d3f2b4a14ffd48fd14733ae93f707 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 8acbdb9a119e0573830a3058b7fc11128a62cbf7..bc6648cc4b5d8c51de9b9621ecf4b643e2801923 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 f3d8b255df6639ffc034f4cd1461eba57f140b17..41c7559c134a97329765b257247d502affcc6911 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 44f0ac06bd23326aef9dff9e21c05143ffe44980..38637d7234b8c9e0f5deda6b2976a59dedbfedb9 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 0b6d64ef9dc1084ef9b0fe4632af9375ef4010a1..03fd257ba8a1b430507b485b882e6d688dceacf0 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 1bca6857f221da20d923e3da32a7f3a1d2b925a2..81ae2fe70249f365b0b8209b0b0bdb60d1f5e723 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 abbec68b9135d58bd4d544b7ec02cae160cde428..3db0cd2153141eb016e24358f32e887582f247f9 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 06961fffac0c87c548559cc70ce686ead8e063cf..5efa3a754fc8098f12ee3ad11cd577f70a745735 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 0107b9317fc2bc0c4cbcbbbb5aa771b289329199..fe91004ca4402d8bf0639b58022568e6f860d731 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 4ee959001744f8b84f0392d4a9df707030cd4666..b70607b67cf11705354d38ac02d9694c1016a5d1 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 282b965839b5f091f704e0472989ab6cfa8b17d8..2b14ad7593664e1c5644e36e7afd067d49aa487f 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 45e0670eae31cb8ca6c75d03ffbc28a9a69f6391..2ece5eb5d177e4600788020d3525e8d02fac103c 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 7788f9b24860e381a2745fc0ee9a2b2a6ceeada5..be3a87df836da65bdb54aef9e2227af7db97ecc1 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 b915b3f08ed954d4df7e2eaaec2969c4bf0789e5..3c533076451fe23e70be8508d94e2bb1e8d1dcbd 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 f62213c64e438b355588ce15d961b1a434c47427..f1c9f06d4e7843593a03531c086b8ba65373934f 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 bb50bd58d9efb18c478d21446225056f441cb481..fd2b60679ad8166393908f376041795fd4e9e0f7 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 f162e5e9bf128b2df02d99cb3c15827275bad498..e2f8bf46e5ca9bffb328d7e70728e317d3e5a641 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 68dd53d0854cb0ce982131cdc030b8eb25afc9f3..15fdcc4f576b42e758349711b70e2b2bdb661a97 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 f3ca9f00b44ae9f0f8daf5fe2c62b8138371a12d..8b637233b7376bea2ddaa52d0b07d8ac53aba165 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 533225583964f5fba45221953340dc1787ca94e1..b50be41f02f86e31db7ca6b3c908fbd87b2f8754 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 8bddd7e332338056fa9e185b71428a101eb55d86..7e18d9e0b57f337fcc5ca654fdda86cc70e6899c 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 7c9affc1306431636b38c527b537a50f1e660f05..205333f65d76c275a8e3db5935f739972679275e 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 f640aa90ae9fdd51f9aac358cc7f1278b6ced771..7ca52cc1a7d14e168d9c2b5db196913b0884d9ce 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 1bd84e188c9a633232a1a92f2da58e1b35fdd44f..f118c365cafa5173319c56bbf07bbf988e66b092 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 100e8580abe7fd434b5e4cd14255a06102af91ca..528318483ce6ef39f678c7dee157e779cb2139ab 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 49357d516671a84b79e5c6b879140de728241c38..ff0947810897643a77f61848fd27123753ce3586 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 dc29736c50e8612d39aa689258bd1b761e667c44..7f55bbe85f24fa38affd3a086114b06776da88a4 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 88b7a159d187cc362280ca2ec21f18cc47ae0658..970f4acddbcead9f5de984dde5c9eb500eb521d0 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 5190c75011ddc0846c6752fe6d3ecbf03e49d1d8..ec1bd8d2b53a754f40d64806edd327bf8e5ffb9f 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 404a3513dd1a7244f035f77f2f3ae32f6044eacd..9eff0379ff4468babcc5549fe4931f6868e2497b 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 55649665f0c93205c15b533441ab6010fe9af8fe..69af6de989590c66552cd0d0c2c148fee827ea2d 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 b386acccfc1a7e292a401656bbf7628fcb400c1b..c9e38b6b8f0820f3ffd1e9021ebebaa8c43687ec 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 404d3abe96344288423a7f6a2e101635eb12c4ee..e77a17b94b540e8079e7b2df37e437e7e32594dc 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 ebf922dba1931d508e163b004baf7b6539bcdb14..6afffdb08689bc932518ae1b0ba45bd8cdb455a9 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 7d32ea051051c35169553d1f7ed58499a80ebebb..bdc7bc4b30bafc77de19bdef3366cba1df1fc513 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 58c06ec6ba34db0f41e5c5e92467f355d5e51086..2d9880082882d5c808393ec7b82c6df432bc39bc 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 178d5385e7eab0f72087df829efa7aa103a798ff..2385636ccef90f8c9e9d8629b0791dfdc6a0147e 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 4344bd907718c4c4a4d81094ec7850d581f8ddc3..271a2950f9b27d0c50f31988fb5c72fa7bd96b94 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 37c4784465e7a2930de501d16c63d04bac586e30..49ada5c4bc2c6dcffb4106e092d55f94328ca9c5 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 159517b29750c8ca30cb947dc55c74d5f32c3067..c35bbfc54d225f05ddea8345ac745968bb4053c2 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 aaf00077c28073e48dbac65841ab63752ead34bc..612844744abe296c269482f5e7d94afbd07472a6 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 b79a4891109c63bf4a8d854cb829caa02f3bbcb2..f98038841de096e573c743fab724eac4963ef4b3 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 99da5ab4532687c34504bab46c9eab1f136308b6..b9726d478733cd9d7b3e8d8c681a2c223c11e643 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 a1550f94bb3f05f8e95a3f629679423ad5c9ffc7..9f66397853ffc99c61b9b0e107683ac46714e1b7 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 17fd146bceb12dadeaace004258abd70d034678f..54f9c6783d8e442667bb1293990b1c5c484f8fe2 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 d5d90f1b162ffb594a64bf3b3f221fde97df6333..dd2e50cec979b048cd571b46b907b8d965deb044 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 b56d9a17ffb6c7bb684740a5295522cb79db48b7..2e8a903018d67c82fced086bb4083f726c9d2947 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 5e8878bb2014c273ef84ddc152fd4bca31c2eef0..b211beee80c21c0fe40aa776e2a972f447c66728 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 82a395bdf3557cd36c039f19cc3370fee2435b49..496d8ce87e6581de445b55a0e06f84411f56feaf 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 c7c1894e74fc20464f7d2480266d72246cc630bc..5efecd82a7c8d0c7f49130d69869d7548fe71227 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 b7d2ed11aab1ca245b06b9ebb40f2ddb3be16b8d..20b09bdc9b7dbca3d89b7aaf2c4fdb6f5c31e35a 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 c3210eb5658a7a4d629853c403e53d28afad012c..b472aee734ffd3629e60e495a9a506205f4ba85c 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 6322ecf44c2d72c662b6b4d1e411ce394f5d67a5..c2c8db6b5c2084980c52b09d9b46118146d9b185 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 39a122002a863321dfcceea77d8cc5e3003bd4f9..28db1deab99b8c26a32e98217d5175f6935162c5 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 279ce05896c8fb52b7c5d1faaf7214218723c7b0..806647d197442368ecbf9afa87abfc24280309d2 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 6501c3d8a9230cb3ab465e631ba5b31e2dbebb1b..620cf0cbc374fc0e0e086e970e38642ea165d994 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 085c400198d69ac31d80bd35864a34c3974f04d1..78c26900a5ace798a93c193f7e585ae119266267 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 e1869235e1b37ceb9fbbd1702c49cce47d11bfd9..b4aa6e9e288f6f19b961245f4aa763cd760db20e 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 1003dbf32dd1ebffb86b240410ecac1b95791c37..3fd98b61683c63cdaf6de1e7e2e929cc0afd8496 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