Commit 3b2e7a92 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier

Merge branch 'master' into salient_behavior

# Conflicts:
#	VadereState/src/org/vadere/state/simulation/VTrajectory.java
parents 70c73914 ad2d8105
......@@ -33,9 +33,9 @@ variables:
# (i.e.,the virtual machines). We have to track that!
stages:
- unit_test
- deploy
- integration_test
- seed_test
- deploy
# PLEASE, OMIT FOLLOWING GITLAB PITFALLS:
#
......
{
"name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "2_bridge_coordinates_kai_navigation_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "2_bridge_coordinates_kai_navigation_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "2_bridge_coordinates_kai_unit_random_pos_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "2_bridge_coordinates_kai_unit_random_pos_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "2_bridge_coordinates_kai_unit_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "2_bridge_coordinates_kai_unit_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_navigation_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_navigation_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_unit_random_pos_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_unit_random_pos_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_unit_with_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_coordinates_kai_unit_without_offset",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
......@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
{
"name" : "bridge_timeCost_NAVIGATION",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -89,7 +89,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 150.0,
"finishTime" : 75.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
......
{
"name" : "bridge_timeCost_OBSTACLES",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -89,7 +89,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 120.0,
"finishTime" : 60.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
......
{
"name" : "bridge_timeCost_QUEUEING",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "bridge_timeCost_UNIT",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "complex_NAVIGATION_001",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -89,7 +89,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 90.0,
"finishTime" : 60.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
......
{
"name" : "complex_NAVIGATION_groups_001",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "complex_UNIT_groups_001",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -93,7 +93,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 150.0,
"finishTime" : 75.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
......
This diff is collapsed.
{
"name" : "C-050-180-180",
"description" : "",
"release" : "0.7",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -92,13 +92,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
"attributes" : {
"pedestrianTrajectoryProcessorId" : 10,
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
"measurementAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
......@@ -119,13 +113,7 @@
"id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"pedestrianVelocityProcessorId" : 13
}
}, {
......@@ -133,20 +121,8 @@
"id" : 12,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"voronoiArea" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
......@@ -162,20 +138,8 @@
"id" : 14,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramEProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"voronoiArea" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
} ],
......@@ -199,7 +163,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 0.1,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
......@@ -321,6 +287,25 @@
},
"id" : -1
} ],
"measurementAreas" : [ {