Skip to content

GitLab

Commit cb6555eb authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Merge branch 'master' into test_client_stsc

parents 0c7fd176 b71107de
Pipeline #177669 passed with stages
in 119 minutes and 39 seconds
Expand all Hide whitespace changes
Inline Side-by-side
Documentation/contributing/Vadere.codestyle.json 0 → 100644
View file @ cb6555eb
This diff is collapsed.
Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario
View file @ cb6555eb
{
"name" : "hm_stairs",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -84,7 +84,7 @@
"useFixedSeed" : false,
"fixedSeed" : 1,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -270,6 +270,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 1,
......@@ -1209,6 +1210,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/ModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario → Scenarios/Demos/OPMOPS-Project/Bang/scenarios/01-Bang-NarrowedStreet.scenario
View file @ cb6555eb
{
"name" : "05_bang_event_narrowed_street",
"name" : "01-Bang-NarrowedStreet",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -879,6 +879,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -927,17 +928,17 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"stimulusInfos" : [ {
"timeframe" : {
"startTime" : 0.0,
"endTime" : 0.4,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "BangEvent",
"targets" : [ ],
"originAsTargetId" : 1
"stimuli" : [ {
"type" : "Bang",
"originAsTargetId" : 1,
"loudness" : 1.0
} ]
} ]
}
......
Scenarios/ModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario → Scenarios/Demos/OPMOPS-Project/Bang/scenarios/02-Bang-GuimaraesPlatz.scenario
View file @ cb6555eb
{
"name" : "06_bang_event_guimaraes_platz",
"name" : "02-Bang-GuimaraesPlatz",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -1139,6 +1139,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -1198,17 +1199,17 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"stimulusInfos" : [ {
"timeframe" : {
"startTime" : 67.0,
"endTime" : 67.4,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "BangEvent",
"targets" : [ ],
"originAsTargetId" : 0
"stimuli" : [ {
"type" : "Bang",
"originAsTargetId" : 0,
"loudness" : 1.0
} ]
} ]
}
......
Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario → Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario
View file @ cb6555eb
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -879,6 +879,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -927,17 +928,17 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"stimulusInfos" : [ {
"timeframe" : {
"startTime" : 92.0,
"endTime" : 92.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "BangEvent",
"targets" : [ ],
"originAsTargetId" : -1
"stimuli" : [ {
"type" : "Bang",
"originAsTargetId" : -1,
"loudness" : 1.0
} ]
} ]
}
......
Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario → Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario
View file @ cb6555eb
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -879,6 +879,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -927,6 +928,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario → Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario
View file @ cb6555eb
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -109,7 +109,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -807,6 +807,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -855,6 +856,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario → Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario
View file @ cb6555eb
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : 0,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -819,6 +819,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -867,6 +868,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario → Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario
View file @ cb6555eb
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
......@@ -103,7 +103,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -2537,6 +2537,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -2576,6 +2577,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario → Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario
View file @ cb6555eb
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -103,7 +103,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -2537,6 +2537,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -2576,6 +2577,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario → Scenarios/Demos/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario
View file @ cb6555eb
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -103,7 +103,7 @@
"useFixedSeed" : true,
"fixedSeed" : -5666974701049342956,
"simulationSeed" : -5666974701049342956,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -2537,6 +2537,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
......@@ -2576,6 +2577,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario
View file @ cb6555eb
{
"name" : "chicken_floorfield_ok_GPU_event",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -82,7 +82,7 @@
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -117,6 +117,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 2,
......@@ -156,6 +157,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario
View file @ cb6555eb
{
"name" : "chicken_floorfield_ok_GPU_parallel",
"description" : "",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -82,7 +82,7 @@
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -117,6 +117,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 2,
......@@ -156,6 +157,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
Scenarios/Demos/bus_station/scenarios/bus_station.scenario
View file @ cb6555eb
{
"name" : "bus_station",
"description" : "Scenario used for TGF19 contribution",
"release" : "1.4",
"release" : "1.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
......@@ -110,7 +110,7 @@
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1,
"useSalientBehavior" : false
"usePsychologyLayer" : false
},
"topography" : {
"attributes" : {
......@@ -279,6 +279,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 1,
......@@ -318,6 +319,6 @@
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
"stimulusInfos" : [ ]
}
}
\ No newline at end of file
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