11.08., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

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: ...@@ -33,9 +33,9 @@ variables:
# (i.e.,the virtual machines). We have to track that! # (i.e.,the virtual machines). We have to track that!
stages: stages:
- unit_test - unit_test
- deploy
- integration_test - integration_test
- seed_test - seed_test
- deploy
# PLEASE, OMIT FOLLOWING GITLAB PITFALLS: # PLEASE, OMIT FOLLOWING GITLAB PITFALLS:
# #
......
{ {
"name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset", "name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset", "name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_with_offset", "name" : "2_bridge_coordinates_kai_navigation_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_without_offset", "name" : "2_bridge_coordinates_kai_navigation_without_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_unit_random_pos_with_offset", "name" : "2_bridge_coordinates_kai_unit_random_pos_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_unit_random_pos_without_offset", "name" : "2_bridge_coordinates_kai_unit_random_pos_without_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_unit_with_offset", "name" : "2_bridge_coordinates_kai_unit_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_unit_without_offset", "name" : "2_bridge_coordinates_kai_unit_without_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091, "fixedSeed" : -5104110572817619091,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "bridge_coordinates_kai_navigation_random_pos_with_offset", "name" : "bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646, "fixedSeed" : -3213925745664992646,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "bridge_coordinates_kai_navigation_random_pos_without_offset", "name" : "bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646, "fixedSeed" : -3213925745664992646,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "bridge_coordinates_kai_navigation_with_offset", "name" : "bridge_coordinates_kai_navigation_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646, "fixedSeed" : -3213925745664992646,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "bridge_coordinates_kai_navigation_without_offset", "name" : "bridge_coordinates_kai_navigation_without_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646, "fixedSeed" : -3213925745664992646,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "bridge_coordinates_kai_unit_random_pos_with_offset", "name" : "bridge_coordinates_kai_unit_random_pos_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646, "fixedSeed" : -3213925745664992646,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "bridge_coordinates_kai_unit_random_pos_without_offset", "name" : "bridge_coordinates_kai_unit_random_pos_without_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646, "fixedSeed" : -3213925745664992646,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "bridge_coordinates_kai_unit_with_offset", "name" : "bridge_coordinates_kai_unit_with_offset",
"description" : "", "description" : "",
"release" : "0.8", "release" : "0.9",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646, "fixedSeed" : -3213925745664992646,
"simulationSeed" : 0 "simulationSeed" : 0
}, },
"eventInfos" : [ ],
"topography" : { "topography" : {
"attributes" : { "attributes" : {
"bounds" : { "bounds" : {
...@@ -278,6 +277,7 @@ ...@@ -278,6 +277,7 @@
}, },
"dynamicElements" : [ ], "dynamicElements" : [ ],
"teleporter" : null "teleporter" : null
} },
"eventInfos" : [ ]
} }
} }
\ No newline at end of file