Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

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" : "hm_stairs", "name" : "hm_stairs",
"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",
...@@ -1204,8 +1204,8 @@ ...@@ -1204,8 +1204,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" : "01-Bang-NarrowedStreet", "name" : "01-Bang-NarrowedStreet",
"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",
...@@ -922,8 +922,8 @@ ...@@ -922,8 +922,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" : "02-Bang-GuimaraesPlatz", "name" : "02-Bang-GuimaraesPlatz",
"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",
...@@ -1193,8 +1193,8 @@ ...@@ -1193,8 +1193,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" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM", "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM",
"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",
...@@ -922,8 +922,8 @@ ...@@ -922,8 +922,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" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM", "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM",
"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",
...@@ -922,8 +922,8 @@ ...@@ -922,8 +922,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" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM", "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM",
"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",
...@@ -850,8 +850,8 @@ ...@@ -850,8 +850,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" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM", "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM",
"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",
...@@ -862,8 +862,8 @@ ...@@ -862,8 +862,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" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents", "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents",
"description" : "", "description" : "",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
...@@ -2571,8 +2571,8 @@ ...@@ -2571,8 +2571,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" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents", "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents",
"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",
...@@ -2571,8 +2571,8 @@ ...@@ -2571,8 +2571,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" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents", "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents",
"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",
...@@ -2571,8 +2571,8 @@ ...@@ -2571,8 +2571,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" : "chicken_floorfield_ok_GPU_event", "name" : "chicken_floorfield_ok_GPU_event",
"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",
...@@ -151,8 +151,8 @@ ...@@ -151,8 +151,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" : "chicken_floorfield_ok_GPU_parallel", "name" : "chicken_floorfield_ok_GPU_parallel",
"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",
...@@ -151,8 +151,8 @@ ...@@ -151,8 +151,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" : "bus_station", "name" : "bus_station",
"description" : "Scenario used for TGF19 contribution", "description" : "Scenario used for TGF19 contribution",
"release" : "1.6", "release" : "1.5",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
...@@ -313,8 +313,8 @@ ...@@ -313,8 +313,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" : "map_mf_small_2", "name" : "map_mf_small_2",
"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",
...@@ -3557,8 +3557,8 @@ ...@@ -3557,8 +3557,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" : "mf_small", "name" : "mf_small",
"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",
...@@ -3130,8 +3130,8 @@ ...@@ -3130,8 +3130,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" : "mf_small_2", "name" : "mf_small_2",
"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",
...@@ -6530,8 +6530,8 @@ ...@@ -6530,8 +6530,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" : "mf_small_simple", "name" : "mf_small_simple",
"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",
...@@ -1969,8 +1969,8 @@ ...@@ -1969,8 +1969,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" : "roVerTest001", "name" : "roVerTest001",
"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",
...@@ -269,8 +269,8 @@ ...@@ -269,8 +269,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" : "scenario001", "name" : "scenario001",
"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",
...@@ -190,8 +190,8 @@ ...@@ -190,8 +190,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" : "scenario002", "name" : "scenario002",
"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",
...@@ -267,8 +267,8 @@ ...@@ -267,8 +267,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
......