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" : "rimea_07_speeds_discrete_ca", "name" : "rimea_07_speeds_discrete_ca",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -199,8 +199,8 @@ ...@@ -199,8 +199,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" : "rimea_07_speeds_nelder_mead", "name" : "rimea_07_speeds_nelder_mead",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -199,8 +199,8 @@ ...@@ -199,8 +199,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" : "rimea_07_speeds_pso", "name" : "rimea_07_speeds_pso",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -487,8 +487,8 @@ ...@@ -487,8 +487,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" : "rimea_08_parameter_variation", "name" : "rimea_08_parameter_variation",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -3142,8 +3142,8 @@ ...@@ -3142,8 +3142,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" : "rimea_09_public_room_2_exits_nelder_mead", "name" : "rimea_09_public_room_2_exits_nelder_mead",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -299,8 +299,8 @@ ...@@ -299,8 +299,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" : "rimea_09_public_room_2_exits_pso", "name" : "rimea_09_public_room_2_exits_pso",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -299,8 +299,8 @@ ...@@ -299,8 +299,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" : "rimea_09_public_room_4_exits_nelder_mead", "name" : "rimea_09_public_room_4_exits_nelder_mead",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -290,8 +290,8 @@ ...@@ -290,8 +290,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" : "rimea_09_public_room_4_exits_pso", "name" : "rimea_09_public_room_4_exits_pso",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -290,8 +290,8 @@ ...@@ -290,8 +290,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" : "rimea_10_pathfinding", "name" : "rimea_10_pathfinding",
"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",
...@@ -847,8 +847,8 @@ ...@@ -847,8 +847,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" : "rimea_11_exit_selection_nelder_mead", "name" : "rimea_11_exit_selection_nelder_mead",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -233,8 +233,8 @@ ...@@ -233,8 +233,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" : "rimea_11_exit_selection_pso", "name" : "rimea_11_exit_selection_pso",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -233,8 +233,8 @@ ...@@ -233,8 +233,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" : "rimea_12_evacuation_nelder_mead", "name" : "rimea_12_evacuation_nelder_mead",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,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" : "rimea_12_evacuation_pso", "name" : "rimea_12_evacuation_pso",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,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" : "rimea_13_stairs_long_nelder_mead", "name" : "rimea_13_stairs_long_nelder_mead",
"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",
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,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" : "rimea_13_stairs_long_pso", "name" : "rimea_13_stairs_long_pso",
"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",
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,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" : "rimea_13_stairs_nelder_mead", "name" : "rimea_13_stairs_nelder_mead",
"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",
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,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" : "rimea_13_stairs_pso", "name" : "rimea_13_stairs_pso",
"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",
...@@ -206,8 +206,8 @@ ...@@ -206,8 +206,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" : "rimea_14_select_route_nelder_mead", "name" : "rimea_14_select_route_nelder_mead",
"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",
...@@ -256,8 +256,8 @@ ...@@ -256,8 +256,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" : "rimea_14_select_route_pso", "name" : "rimea_14_select_route_pso",
"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",
...@@ -256,8 +256,8 @@ ...@@ -256,8 +256,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" : "see_small_wall_nelder_mead_ok", "name" : "see_small_wall_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -214,8 +214,8 @@ ...@@ -214,8 +214,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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment