Commit ebbe7bf8 authored by Marion Goedel's avatar Marion Goedel
Browse files

Merge branch 'master' into Branch_d77a1a8d

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
parents e9c836d5 f5390f1d
{
"name" : "hm_stairs",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......
{
"name" : "01-Kaiserslautern-Groß",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
{
"name" : "02-Kaiserslautern-Mittel",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......
{
"name" : "03-Kaiserslautern-Klein",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
......
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......
{
"name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......
{
"name" : "chicken_floorfield_ok_GPU_event",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......
{
"name" : "chicken_floorfield_ok_GPU_parallel",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......
{
"name" : "DenseCrowd",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -413,7 +413,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -461,7 +464,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -509,7 +515,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -557,7 +566,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -605,7 +617,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -653,7 +668,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -701,7 +719,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -749,7 +770,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -797,7 +821,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -845,7 +872,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -893,7 +923,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -941,7 +974,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -989,7 +1025,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......
{
"name" : "DenseCrowd_withoutGroups",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -413,7 +413,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -461,7 +464,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -509,7 +515,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -557,7 +566,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -605,7 +617,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -653,7 +668,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -701,7 +719,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -749,7 +770,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -797,7 +821,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -845,7 +872,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -893,7 +923,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -941,7 +974,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -989,7 +1025,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......
{
"name" : "DenseCrowd_withoutGroups_fineTargetGrid",
"description" : "",
"release" : "1.12",
"release" : "1.13",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -345,7 +345,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -393,7 +396,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -441,7 +447,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -489,7 +498,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -537,7 +549,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -585,7 +600,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -633,7 +651,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -681,7 +702,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -729,7 +753,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -777,7 +804,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -825,7 +855,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -873,7 +906,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......@@ -921,7 +957,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : null,
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ 2 ],
"groupSizes" : [ ],
......