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_04_flow_sfm1_025_h", "name" : "rimea_04_flow_sfm1_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_sfm1_050_h", "name" : "rimea_04_flow_sfm1_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_sfm1_075_h", "name" : "rimea_04_flow_sfm1_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_sfm1_100_h", "name" : "rimea_04_flow_sfm1_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_sfm1_125_h", "name" : "rimea_04_flow_sfm1_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_sfm1", "name" : "rimea_05_react_sfm1",
"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_sfm1", "name" : "rimea_06_corner_sfm1",
"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",
...@@ -187,8 +187,8 @@ ...@@ -187,8 +187,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_sfm1", "name" : "rimea_07_speeds_sfm1",
"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",
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,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_sfm1", "name" : "rimea_10_pathfinding_sfm1",
"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",
...@@ -786,8 +786,8 @@ ...@@ -786,8 +786,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" : "stairs_diagonal_1_+1", "name" : "stairs_diagonal_1_+1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_1_-1", "name" : "stairs_diagonal_1_-1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_2_+1", "name" : "stairs_diagonal_2_+1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_2_-1", "name" : "stairs_diagonal_2_-1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_3_+1", "name" : "stairs_diagonal_3_+1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_3_-1", "name" : "stairs_diagonal_3_-1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_4_+1", "name" : "stairs_diagonal_4_+1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_4_-1", "name" : "stairs_diagonal_4_-1",
"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",
...@@ -213,8 +213,8 @@ ...@@ -213,8 +213,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" : "stairs_diagonal_both_1_2_+1", "name" : "stairs_diagonal_both_1_2_+1",
"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",
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,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" : "stairs_diagonal_both_1_2_-1", "name" : "stairs_diagonal_both_1_2_-1",
"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",
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,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" : "stairs_diagonal_both_3_4_+1", "name" : "stairs_diagonal_both_3_4_+1",
"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",
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,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