Commit f9c3c80d authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Revert "Migrated all scenario files to version 1.6"

This reverts commit 35976b6f.

# Conflicts:
#	Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlow-SBEnabled.scenario
parent 950ed83c
{ {
"name" : "05-UnidirectionalFlow-OSMSequential-SBEnabled", "name" : "05-UnidirectionalFlow-OSMSequential-SBEnabled",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "06-CounterFlow-OSMSequential-SBDisabled", "name" : "06-CounterFlow-OSMSequential-SBDisabled",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -215,8 +215,8 @@ ...@@ -215,8 +215,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "07-CounterFlow-OSMSequential-SBEnabled", "name" : "07-CounterFlow-OSMSequential-SBEnabled",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -215,8 +215,8 @@ ...@@ -215,8 +215,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted", "name" : "08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -215,8 +215,8 @@ ...@@ -215,8 +215,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 0.75, "searchRadius" : 0.75,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "09-OriginalExperimentSetup-OSMEventDriven", "name" : "09-OriginalExperimentSetup-OSMEventDriven",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -255,8 +255,8 @@ ...@@ -255,8 +255,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -298,8 +298,8 @@ ...@@ -298,8 +298,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -341,8 +341,8 @@ ...@@ -341,8 +341,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -384,8 +384,8 @@ ...@@ -384,8 +384,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -427,8 +427,8 @@ ...@@ -427,8 +427,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -470,8 +470,8 @@ ...@@ -470,8 +470,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -513,8 +513,8 @@ ...@@ -513,8 +513,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -556,8 +556,8 @@ ...@@ -556,8 +556,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -599,8 +599,8 @@ ...@@ -599,8 +599,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -642,8 +642,8 @@ ...@@ -642,8 +642,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -685,8 +685,8 @@ ...@@ -685,8 +685,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -728,8 +728,8 @@ ...@@ -728,8 +728,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -771,8 +771,8 @@ ...@@ -771,8 +771,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"source" : null, "source" : null,
"targetIds" : [ ], "targetIds" : [ ],
...@@ -813,8 +813,8 @@ ...@@ -813,8 +813,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled", "name" : "10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled", "name" : "11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -244,8 +244,8 @@ ...@@ -244,8 +244,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "12-CounterFlow-SBEnabled", "name" : "12-CounterFlow-SBEnabled",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -251,8 +251,8 @@ ...@@ -251,8 +251,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_GRADIENT", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 25.0 "targetOrientationAngleThreshold" : 25.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : null "attributesCar" : null
......
{ {
"name" : "13-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero", "name" : "13-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -239,8 +239,8 @@ ...@@ -239,8 +239,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : { "attributesCar" : {
...@@ -254,8 +254,8 @@ ...@@ -254,8 +254,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0, "targetOrientationAngleThreshold" : 45.0,
"length" : 4.5, "length" : 4.5,
"width" : 1.7, "width" : 1.7,
"direction" : { "direction" : {
......
{ {
"name" : "14-Test-TargetChanger-ChangesTargetIfProbabilityIsOne", "name" : "14-Test-TargetChanger-ChangesTargetIfProbabilityIsOne",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -239,8 +239,8 @@ ...@@ -239,8 +239,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : { "attributesCar" : {
...@@ -254,8 +254,8 @@ ...@@ -254,8 +254,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0, "targetOrientationAngleThreshold" : 45.0,
"length" : 4.5, "length" : 4.5,
"width" : 1.7, "width" : 1.7,
"direction" : { "direction" : {
......
{ {
"name" : "15-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf", "name" : "15-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -239,8 +239,8 @@ ...@@ -239,8 +239,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0 "targetOrientationAngleThreshold" : 45.0
}, },
"teleporter" : null, "teleporter" : null,
"attributesCar" : { "attributesCar" : {
...@@ -254,8 +254,8 @@ ...@@ -254,8 +254,8 @@
"acceleration" : 2.0, "acceleration" : 2.0,
"footstepHistorySize" : 4, "footstepHistorySize" : 4,
"searchRadius" : 1.0, "searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER", "angleCalculationType" : "USE_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0, "targetOrientationAngleThreshold" : 45.0,
"length" : 4.5, "length" : 4.5,
"width" : 1.7, "width" : 1.7,
"direction" : { "direction" : {
......