Skip to content

GitLab

Commit b08e3d0d authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Renamed all test scenarios under "TestPsychology" systematically 

Performed following steps:
1. Applied "copy_scenario_filename_into_scenario.py" to "TestPsychology"
2. Opened all scenario files "TestPsychology" in Vadere to enforce pretty printing in scenario files
3. Moved three "Threat" scenarios from folder "Perception" to "CognitionAndBehavior"
parent e9f91aff
Pipeline #211807 passed with stages
in 142 minutes and 47 seconds
Hide whitespace changes
Inline Side-by-side
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario
View file @ b08e3d0d
{
"name" : "01-ExperimentSetup-OSMEventDriven-SBDisabled",
"name" : "01-SimplifiedExperiment-OSMEventDriven-PsychDisabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -168,6 +168,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -816,4 +817,4 @@
},
"stimulusInfos" : [ ]
}
}
}
\ No newline at end of file
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario
View file @ b08e3d0d
{
"name" : "02-ExperimentSetup-OSMEventDriven-SBEnabled",
"name" : "02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -168,6 +168,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -816,4 +817,4 @@
},
"stimulusInfos" : [ ]
}
}
}
\ No newline at end of file
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario
View file @ b08e3d0d
{
"name" : "03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted",
"name" : "03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -168,6 +168,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -816,4 +817,4 @@
},
"stimulusInfos" : [ ]
}
}
}
\ No newline at end of file
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario
View file @ b08e3d0d
{
"name" : "04-ExperimentSetup-OSMSequential-SBEnabled",
"name" : "04-SimplifiedExperiment-OSMSequential-PsychEnabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -168,6 +168,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -816,4 +817,4 @@
},
"stimulusInfos" : [ ]
}
}
}
\ No newline at end of file
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario
View file @ b08e3d0d
{
"name" : "09-OriginalExperimentSetup-OSMEventDriven",
"name" : "05-OriginalExperiment-OSMEventDriven-PsychEnabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -248,6 +248,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario
View file @ b08e3d0d
{
"name" : "05-UnidirectionalFlow-OSMSequential-SBEnabled",
"name" : "06-UnidirectionalFlow-OSMSequential-PsychEnabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -168,6 +168,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario
View file @ b08e3d0d
{
"name" : "06-CounterFlow-OSMSequential-SBDisabled",
"name" : "07-CounterFlow-OSMSequential-PsychDisabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -185,6 +185,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -205,6 +206,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario
View file @ b08e3d0d
{
"name" : "07-CounterFlow-OSMSequential-SBEnabled",
"name" : "08-CounterFlow-OSMSequential-PsychEnabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -185,6 +185,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -205,6 +206,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario
View file @ b08e3d0d
{
"name" : "08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted",
"name" : "09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -185,6 +185,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -205,6 +206,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlow-SBEnabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario
View file @ b08e3d0d
{
"name" : "12-CounterFlow-SBEnabled",
"name" : "10-CounterFlowChicken-OSMEventDriven-PsychEnabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -221,6 +221,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -241,6 +242,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario
View file @ b08e3d0d
{
"name" : "10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled",
"name" : "11-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -234,6 +234,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario
View file @ b08e3d0d
{
"name" : "11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled",
"name" : "12-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -234,6 +234,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/Perception/scenarios/09-Threat-Short-SelfCatThreatModel.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-ThreatShort-SelfCatThreatModel.scenario
View file @ b08e3d0d
{
"name" : "08-ThreatShort-SelfCatThreatModel",
"name" : "13-ThreatShort-SelfCatThreatModel",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -249,6 +249,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -269,6 +270,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -354,4 +356,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
Scenarios/ModelTests/TestPsychology/Perception/scenarios/10-Threat-Long-SelfCatThreatModel.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-ThreatLong-SelfCatThreatModel.scenario
View file @ b08e3d0d
{
"name" : "09-ThreatLong-SelfCatThreatModel",
"name" : "14-ThreatLong-SelfCatThreatModel",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -249,6 +249,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -269,6 +270,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -354,4 +356,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
Scenarios/ModelTests/TestPsychology/Perception/scenarios/10-Threat-ImitatingBehavior-SelfCatThreatModel.scenario → Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-Threat-ImitatingBehavior-SelfCatThreatModel.scenario
View file @ b08e3d0d
{
"name" : "10-ThreatImitating-SelfCatThreatModel",
"name" : "15-Threat-ImitatingBehavior-SelfCatThreatModel",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -249,6 +249,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -269,6 +270,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -402,4 +404,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSM-Sequential.scenario → Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario
View file @ b08e3d0d
{
"name" : "01-Wait-OSM-Sequential",
"name" : "01-Wait-OSMSequential",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -205,6 +205,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -225,6 +226,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSM-EventDriven.scenario → Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario
View file @ b08e3d0d
{
"name" : "02-Wait-OSM-EventDriven",
"name" : "02-Wait-OSMEventDriven",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -205,6 +205,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -225,6 +226,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-Wait-Recurring-OSM-Sequential.scenario → Scenarios/ModelTests/TestPsychology/Perception/scenarios/03-WaitRecurring-OSMSequential.scenario
View file @ b08e3d0d
{
"name" : "03-Wait-Recurring-OSM-Sequential",
"name" : "03-WaitRecurring-OSMSequential",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -205,6 +205,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -225,6 +226,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSM-Sequential.scenario → Scenarios/ModelTests/TestPsychology/Perception/scenarios/04-WaitInArea-OSMSequential.scenario
View file @ b08e3d0d
{
"name" : "04-WaitInArea-OSM-Sequential",
"name" : "04-WaitInArea-OSMSequential",
"description" : "",
"release" : "1.10",
"processWriters" : {
......@@ -205,6 +205,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -225,6 +226,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
Scenarios/ModelTests/TestPsychology/Perception/scenarios/05-WaitInArea-BHM.scenario
View file @ b08e3d0d
......@@ -202,6 +202,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
......@@ -222,6 +223,7 @@
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
......
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