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,

VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario

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