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

Merge branch 'master' into add_knowledge_base

parents a5a731d2 8223628d
Pipeline #240438 passed with stages
in 141 minutes and 8 seconds
...@@ -172,7 +172,8 @@ ...@@ -172,7 +172,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
......
...@@ -172,7 +172,8 @@ ...@@ -172,7 +172,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
......
...@@ -172,7 +172,8 @@ ...@@ -172,7 +172,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
......
...@@ -172,7 +172,8 @@ ...@@ -172,7 +172,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
......
{ {
"name" : "05-OriginalExperiment-OSMEventDriven-PsychEnabled", "name" : "06-OriginalExperiment-OSMEventDriven-PsychEnabled",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -252,7 +253,8 @@ ...@@ -252,7 +253,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"name" : "07-CounterFlow-OSMSequential-PsychDisabled", "name" : "07-CounterFlow-OSMSequential-PsychDisabled",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -189,7 +190,8 @@ ...@@ -189,7 +190,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, { }, {
"id" : 4, "id" : 4,
"shape" : { "shape" : {
...@@ -210,7 +212,8 @@ ...@@ -210,7 +212,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ ], "dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
......
{ {
"name" : "06-UnidirectionalFlow-OSMSequential-PsychEnabled", "name" : "08-UnidirectionalFlow-OSMSequential-PsychEnabled",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -172,7 +173,8 @@ ...@@ -172,7 +173,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ ], "dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
......
{ {
"name" : "08-CounterFlow-OSMSequential-PsychEnabled", "name" : "09-CounterFlow-OSMSequential-PsychEnabled",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -189,7 +190,8 @@ ...@@ -189,7 +190,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, { }, {
"id" : 4, "id" : 4,
"shape" : { "shape" : {
...@@ -210,7 +212,8 @@ ...@@ -210,7 +212,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ ], "dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
......
{ {
"name" : "09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted", "name" : "10-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -189,7 +190,8 @@ ...@@ -189,7 +190,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, { }, {
"id" : 4, "id" : 4,
"shape" : { "shape" : {
...@@ -210,7 +212,8 @@ ...@@ -210,7 +212,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ ], "dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
......
{ {
"name" : "10-CounterFlowChicken-OSMEventDriven-PsychEnabled", "name" : "11-CounterFlowChicken-OSMEventDriven-PsychEnabled",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -225,7 +226,8 @@ ...@@ -225,7 +226,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, { }, {
"id" : 4, "id" : 4,
"shape" : { "shape" : {
...@@ -246,7 +248,8 @@ ...@@ -246,7 +248,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ ], "dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
......
{ {
"name" : "11-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled", "name" : "12-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -238,7 +239,8 @@ ...@@ -238,7 +239,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ ], "dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
......
{ {
"name" : "12-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled", "name" : "13-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...@@ -238,7 +239,8 @@ ...@@ -238,7 +239,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ ], "dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
......
{ {
"name" : "13-ThreatShort-SelfCatThreatModel", "name" : "14-ThreatShort-SelfCatThreatModel",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -253,7 +254,8 @@ ...@@ -253,7 +254,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, { }, {
"id" : 2, "id" : 2,
"shape" : { "shape" : {
...@@ -274,7 +276,8 @@ ...@@ -274,7 +276,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
......
{ {
"name" : "14-ThreatLong-SelfCatThreatModel", "name" : "15-ThreatLong-SelfCatThreatModel",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -253,7 +254,8 @@ ...@@ -253,7 +254,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, { }, {
"id" : 2, "id" : 2,
"shape" : { "shape" : {
...@@ -274,7 +276,8 @@ ...@@ -274,7 +276,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
......
{ {
"name" : "15-Threat-ImitatingBehavior-SelfCatThreatModel", "name" : "16-Threat-ImitatingBehavior-SelfCatThreatModel",
"description" : "", "description" : "",
"release" : "1.11", "release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -253,7 +254,8 @@ ...@@ -253,7 +254,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, { }, {
"id" : 2, "id" : 2,
"shape" : { "shape" : {
...@@ -274,7 +276,8 @@ ...@@ -274,7 +276,8 @@
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ], } ],
"dynamicElements" : [ { "dynamicElements" : [ {
"attributes" : { "attributes" : {
...@@ -372,6 +375,54 @@ ...@@ -372,6 +375,54 @@
}, },
"modelPedestrianMap" : null, "modelPedestrianMap" : null,
"type" : "PEDESTRIAN" "type" : "PEDESTRIAN"
}, {
"attributes" : {
"id" : 6,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
"walkingDirectionCalculation" : "BY_TARGET_CENTER",
"walkingDirectionSameIfAngleLessOrEqual" : 45.0
},
"source" : null,
"targetIds" : [ ],
"nextTargetListIndex" : 0,
"isCurrentTargetAnAgent" : false,
"position" : {
"x" : 4.6,
"y" : 11.0
},
"velocity" : {
"x" : 0.0,
"y" : 0.0
},
"freeFlowSpeed" : 1.0043602396182303,
"followers" : [ ],
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"psychologyStatus" : {
"mostImportantStimulus" : null,
"threatMemory" : {
"allThreats" : [ ],
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
},
"groupIds" : [ ],
"groupSizes" : [ ],
"trajectory" : {
"footSteps" : [ ]
},
"modelPedestrianMap" : null,
"type" : "PEDESTRIAN"
} ], } ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
......
{
"name" : "17-ScriptAgents-ChangeTargetScriptedCognitionModel",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1, 2 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"processors" : [ 3 ]
}, {