Skip to content

GitLab

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

Merge branch 'master' into salient_behavior 

# Conflicts:
#	VadereState/src/org/vadere/state/simulation/VTrajectory.java
parents 70c73914 ad2d8105
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 3b2e7a92
......@@ -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:
#
......
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario
View file @ 3b2e7a92
{
"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
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario
View file @ 3b2e7a92
{
"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,
......
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario
View file @ 3b2e7a92
{
"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,
......
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario
View file @ 3b2e7a92
{
"name" : "bridge_timeCost_QUEUEING",
"description" : "",
"release" : "0.8",
"release" : "0.9",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
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