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,
......
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"code_folding": []
},
"outputs": [],
"source": [
"import json\n",
"import numpy as np\n",
"import pandas as pd\n",
"import math\n",
"import matplotlib.pyplot as plt\n",
"from matplotlib.lines import Line2D\n",
"\n",
"file = \"./data/trajectories_distance.txt\"\n",
"real_file = \"./data/KO/ko-240-120-240/ko-240-120-240_combined_MB.txt\"\n",
"f = open(file, \"r\")\n",
"header = f.readline();\n",
"trajectories = dict({});\n",
"for row in f:\n",
" s = row.split(\" \");\n",
" pedId = int(s[0]);\n",
" footsteps = json.loads(s[1]);\n",
" trajectories[pedId] = footsteps[0]['footSteps'];\n",
" \n",
"def get_trajectory(pedId):\n",
" return trajectories[pedId]\n",
"\n",
"def get_footstep(trajectory, i):\n",
" return trajectory[i];\n",
"\n",
"def start_time(trajectory):\n",
" return trajectory[0]['startTime'];\n",
"\n",
"def max_start_time(trajectories):\n",
" return max(map(lambda i: start_time(trajectories[i]), trajectories))\n",