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" : "T-240-240-240_OSM", "name" : "T-240-240-240_OSM",
"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",
...@@ -490,8 +490,8 @@ ...@@ -490,8 +490,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" : "floor_field_navigation_test_displaced_ok", "name" : "floor_field_navigation_test_displaced_ok",
"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",
...@@ -195,8 +195,8 @@ ...@@ -195,8 +195,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" : "floor_field_navigation_test_ok", "name" : "floor_field_navigation_test_ok",
"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",
...@@ -249,8 +249,8 @@ ...@@ -249,8 +249,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" : "basic_1_chicken_gnm1", "name" : "basic_1_chicken_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,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" : "basic_1_chicken_gnm1_displaced", "name" : "basic_1_chicken_gnm1_displaced",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,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" : "basic_1_chicken_gnm2", "name" : "basic_1_chicken_gnm2",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -159,8 +159,8 @@ ...@@ -159,8 +159,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" : "basic_2_density_gnm1", "name" : "basic_2_density_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -168,8 +168,8 @@ ...@@ -168,8 +168,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" : "basic_3_1_wall_gnm1", "name" : "basic_3_1_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,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" : "basic_3_2_wall_gnm1", "name" : "basic_3_2_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,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" : "basic_3_3_wall_gnm1", "name" : "basic_3_3_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,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" : "basic_4_1_wall_gnm1", "name" : "basic_4_1_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,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" : "basic_4_2_wall_gnm1", "name" : "basic_4_2_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,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_01_pathway_gnm1", "name" : "rimea_01_pathway_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,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_04_flow_gnm1_025_h", "name" : "rimea_04_flow_gnm1_025_h",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,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_04_flow_gnm1_050_h", "name" : "rimea_04_flow_gnm1_050_h",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,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_04_flow_gnm1_075_h", "name" : "rimea_04_flow_gnm1_075_h",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,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_04_flow_gnm1_100_h", "name" : "rimea_04_flow_gnm1_100_h",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,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_04_flow_gnm1_125_h", "name" : "rimea_04_flow_gnm1_125_h",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,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_05_react_gnm1", "name" : "rimea_05_react_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -150,8 +150,8 @@ ...@@ -150,8 +150,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_06_corner_gnm1", "name" : "rimea_06_corner_gnm1",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -150,8 +150,8 @@ ...@@ -150,8 +150,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
......
Markdown is supported
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