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",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -490,8 +490,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "floor_field_navigation_test_displaced_ok",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -195,8 +195,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "floor_field_navigation_test_ok",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -249,8 +249,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_1_chicken_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -159,8 +159,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_1_chicken_gnm1_displaced",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -159,8 +159,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_1_chicken_gnm2",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -159,8 +159,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_2_density_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -168,8 +168,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_3_1_wall_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -141,8 +141,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_3_2_wall_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -141,8 +141,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_3_3_wall_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -141,8 +141,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_4_1_wall_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -141,8 +141,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "basic_4_2_wall_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -141,8 +141,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_01_pathway_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -132,8 +132,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_04_flow_gnm1_025_h",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -132,8 +132,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_04_flow_gnm1_050_h",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -132,8 +132,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_04_flow_gnm1_075_h",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -132,8 +132,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_04_flow_gnm1_100_h",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -132,8 +132,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_04_flow_gnm1_125_h",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -132,8 +132,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_05_react_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -150,8 +150,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : null
......
{
"name" : "rimea_06_corner_gnm1",
"description" : "",
"release" : "1.6",
"release" : "1.5",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -150,8 +150,8 @@
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : 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