Merge branch 'master' into salient_behavior

# Conflicts:
#	VadereState/src/org/vadere/state/simulation/VTrajectory.java

.gitlab-ci.yml

@@ -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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "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

 {
   "name" : "bridge_timeCost_QUEUEING",
   "description" : "",
-  "release" : "0.8",
+  "release" : "0.9",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",

Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario

 {
   "name" : "bridge_timeCost_UNIT",
   "description" : "",
-  "release" : "0.8",
+  "release" : "0.9",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",

Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario

 {
   "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,

Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario

 {
   "name" : "complex_NAVIGATION_groups_001",
   "description" : "",
-  "release" : "0.8",
+  "release" : "0.9",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",

Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario

 {
   "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,

Tools/Notebooks/TrajectoryMetric.ipynb

+{
+ "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",
+    "\n",
+    "def end_time(trajectory):\n",
+    "    return trajectory[-1]['endTime'];\n",
+    "\n",
+    "def min_end_time(trajectories):\n",
+    "    return min(map(lambda i: end_time(trajectories[i]), trajectories))\n",
+    "\n",
+    "def length(fs):\n",
+    "    start = fs['start'];\n",
+    "    end = fs['end'];\n",
+    "    x1 = start['x'];\n",
+    "    y1 = start['y'];\n",
+    "    x2 = end['x'];\n",
+    "    y2 = end['y'];\n",
+    "    dx = x1-x2;\n",
+    "    dy = y1-y2;\n",
+    "    return np.sqrt(dx*dx + dy*dy);\n",
+    "\n",
+    "def trajectory_length(trajectory):\n",
+    "    return sum(map(lambda fs : length(fs), trajectory))\n",
+    "\n",
+    "def direction(fs):\n",
+    "    start = fs['start'];\n",
+    "    end = fs['end'];\n",
+    "    x1 = start['x'];\n",
+    "    y1 = start['y'];\n",
+    "    x2 = end['x'];\n",
+    "    y2 = end['y'];\n",
+    "    return np.array([x2-x1, y2-y1]);\n",
+    "\n",
+    "def duration(fs):\n",
+    "    startTime = fs['startTime'];\n",
+    "    endTime = fs['endTime'];\n",
+    "    return endTime-startTime;\n",
+    "\n",
+    "def speed(fs):\n",
+    "    return length(fs) / duration(fs);\n",
+    "\n",
+    "def is_between(fs, time):\n",
+    "    startTime = fs['startTime'];\n",
+    "    endTime = fs['endTime'];\n",
+    "    return startTime <= time and time < endTime;\n",
+    "\n",
+    "def footstep(trajectory, time):\n",
+    "    l = list(filter(lambda fs : is_between(fs, time), trajectory))\n",
+    "    assert len(l) <= 1;\n",
+    "    if len(l) == 1:\n",
+    "        return l[0];\n",
+    "\n",
+    "def position(trajectory, time):\n",
+    "    fs = footstep(trajectory, time);\n",
+    "    if fs != None:\n",
+    "        startTime = fs['startTime'];\n",
+    "        endTime = fs['endTime'];\n",
+    "        dur = duration(fs);\n",
+    "        partial_dur = time - startTime;\n",
+    "        ratio = partial_dur / dur;\n",
+    "        start = fs['start'];\n",
+    "        x1 = start['x'];\n",
+    "        y1 = start['y'];\n",
+    "        l = length(fs);\n",
+    "        if l == 0.0:\n",
+    "            return np.array([x1, y1])\n",
+    "        else:    \n",
+    "            partial_l = l * ratio;\n",