Merged branch 'master' into add_event_handling, but removed event handling in...

Merged branch 'master' into add_event_handling, but removed event handling in "OptimalStepsModel.java" to avoid merge conflicts.

# Conflicts:
#	.gitlab-ci.yml
#	VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario
#	VadereSimulator/src/org/vadere/simulator/control/Simulation.java
#	VadereSimulator/src/org/vadere/simulator/models/osm/OptimalStepsModel.java

.gitignore

@@ -2,6 +2,10 @@
 target/
 *.out
 *.preferences.xml
+swing-inspector-linux-1.2.3/
+
+#Tools and build utils
+bin/
 
 #IntelliJ
 .idea/
@@ -17,9 +21,11 @@ target/
 VadereGui/*.png
 VadereGui/*.svg
 VadereGui/*.mov
+VadereGui/testResources/**/*.legacy
 VadereUtils/testreports/*.txt
 VadereUtils/output/*
 VadereSimulator/resources/current_commit_hash.txt
+VadereSimulator/testResources/**/*.legacy
 
 #model test output
 VadereModelTests/TestOSM/output/*
@@ -41,7 +47,6 @@ VadereModelTests/TestOVM/processed output/*
 VadereUtils/output/*
 
 #deprecated: can potentially be removed
-bin/
 VadereGui/output/
 
 #mac osx files

.gitlab-ci.yml

@@ -41,17 +41,18 @@ unit_tests_with_coverage:
     stage: test
     
     script:
+        - Documentation/version-control/git-hook-vadere-software
         - mvn clean
-        - mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList test
+        - mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel test
         - python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py
     artifacts:
         paths:
             - "*/target/site/coverage-reports"
 
-#run_scenario_files:
-#    stage: deploy
-#  
-#    script:
-#        - mvn clean
-#        - mvn -Dmaven.test.skip=true package
-#        - python3 Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py
+run_scenario_files:
+    stage: deploy
+
+    script:
+        - Documentation/version-control/git-hook-vadere-software
+        - mvn -Dmaven.test.skip=true package
+        - python3 Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py

CHANGELOG.md

+**Note:** Before writing into this file, read the guidelines in [Writing Changelog Entries.md](Documentation/contributing/Writing Changelog Entries.md).
+
+# In Progress: v0.7
+
+## Added
+
+- Two new outputprocessors - mainly for the BHM - to evaluaet queueWidth
+  (QueueWidthProcessor) and behavior (PedestrianBehaviorProcessor)
+
+- In package `org.vadere.simulator.utils`, added `TopographyChecker` to show
+  user if the current topography contains problems. The  `TopographyChecker`
+  will check for overlapping `ScenarioElements` and check for inconsistence
+  settings such as missing  TargetIDs for sources or inconsistenct speed ranges
+  for pedestrians. See this
+  [table](Documentation/changelLogImages/TopographyCheckerMessages.md) for
+  supported warnings and erros as well as this
+  [picture](Documentation/changelLogImages/TopographyChecker.png) to see which
+  kind of overlap produces erros or warnings.
+- Add `--output-dir [on, off]` (default: `on`) switch to  `scenario-run`
+  sub-command. This will will turn the ScenarioChecker on or off for the command
+  line. If the Checker detects an error  the simulation will not be executed.
+
+# v0.6 (2018-09-07)
+
+## Added
+
+- Graphical simulation result is displayed in a table view to show run-time and overlap information if the corresponding processors are loaded. The Simulation result dialog can be deactivated in the preferences. (5ffca5a3: Simulator, GUI)
+- Added new OutputProcessors for Overlaps. (8028c523: Simulator)
+- Added "fixedSeed" and "simulationSeed" to AttributesSimulation. (79268262: Simulator)
+- VadereConsole.jar migrate will migrate all scenario files within the specified directory and all child directories. (37fde165: Simulator)
+  * To exclude specific sub-trees or only specific directories the igonoreDirs List can be expanded.
+  * DO_NOT_MIGRATE or .DO_NOT_MIGRATE: Ignore current directory but continue with existing child directories.
+  * DO_NOT_MIGRATE_TREE or .DO_NOT_MIGRATE_TREE: Ignore the directories and the complete sub-tree.
+- Added a new OutputProcessor, NumberOverlapsProcessor. This processor saves the number of overlaps that occurred during a simulation run. It needs the PedestrianOverlapProcessor. (57d90e93: Simulator, State)
+- Added sub commands to "VadereConsole": project-run, scenario-run, suq, migrate (c7e0538c: GUI)
+- In the onlinevisualization it is now possible to display the target potential field of a selected pedestrian. (123457aa: GUI)
+
+## Changed
+
+- PedestrianOverlapProcessor returns two values "distance", "overlaps"for each overlap detected. (5ffca5a3: Simulator)
+  * If no overlap occurs the output is empty.
+  * "distance": The distance between the center of the two pedestrians
+  * "overlaps": The amount the two pedestrian overlap
+- Moved and renamed attributes in scenario files. (c7e0538c: State)
+  * Move /scenario/attributesModel/org.vadere.state.attributes.models.AttributesCGM/groupSizeDistribution to each source in /scenario/topography/sources/[]/groupSizeDistribution. This allows different group size distribution for each source
+  * Rename /scenario/attributesModel/*/timeCostAttributes/standardDerivation to standardDeviation.
+
+## Performance
+
+- Faster distance computation. (6214738c: Simulator)
+  * To compute the distance from a point x the closest obstacle we compute the distances on a Cartesian grid of cell size equal to the default value of AttributesFloorField.potentialFieldResolution. There are two methods to compute the distances.
+  * Brute force (default): Compute the distance for a grid point x by computing all distances (for all obstacles) taking the minimal
+  * Eikonal Equation solvers (unused): Use obstacles to be the targets are of the eikonal equation and solve the equation using one of the solvers (default is the Fast Marching Method).
+
+# v0.2 (2016-12-22)
+
+## Added
+
+- Stability and usability improved, additional pedestrian simulation models are supported. (babf0b67: GUI, Simulator, State, Utils)
+
+# v0.1 (2016-08-05)
+
+## Added
+
+- Initial release of the software as open source. (72391fab: GUI, Simulator, State, Utils)

CONTRIBUTING.md

@@ -31,7 +31,7 @@ Basic rules:
 
 For source code formatting, we use an adapted version of
 [Google's Coding style guide](https://google.github.io/styleguide/javaguide.html).
-Please check the [README in this repository](/vadere/styleguide)
+Please check the [README in this repository](https://gitlab.lrz.de/vadere/styleguide)
 for the style guide and for how to import the style settings into your IDE.
 
 Commit style guide

Documentation/changelLogImages/TopographyCheckerMessages.md

+# TopographyChecker Messages
+
+## Overlapping ScenarioElements
+
+|Type of Elemetns    |	TotalOvelrap/ contained in 	|  PartialOverlap  |
+|--------------------|:----------------:|:----------------:|
+|Obstacle / Obstacle | 	     WARN       |       ./.        |
+|Obstacle / Source   |       ERROR      |       ERROR      |
+|Obstacle / Target   |       ERROR      |       WARN       |
+|Obstacle / Stairs   |       ERROR      |       WARN       |
+|Obstacle / Ped.     |       ERROR      |       ERROR      |
+|Source   / Source   |       WARN       |       WARN       |
+|Source   / Target   |       WARN       |       WARN       |
+|Source   / Stairs   |       WARN       |       WARN       |
+|Target   / Target   |       WARN       |       WARN       |
+|Target   / Stairs   |       WARN       |       WARN       |
+|Stairs   / Stairs   |       ERROR      |       ERROR      |
+
+Legend:
+
+WARN Warning but simulation is possible
+ERROR Error and simulation is not possible
+./. Nothing to do all good
+
+
+## Misc Tests
+
+### Errors
+
+- A Source has no targetId set but is setup to spawn pedestrians. Solution: Set targetId
+- A Source has a targetId set but the target does not exist. Solution: Create target or remove unused targetId from Source.
+- If the SpeedDistributionMean of a pedestrian ist not between min/max speed.
+
+
+### Warnings
+
+- A Source has no targetId set and does not spawn pedestrians. Solution: Possible error
+- A Target is never used by any Source. Solution: Possible error and this will cost performance.
+- The Stairs model only works for 'normal' one-step-stairs. If the tread is outside of
+  the range of 10cm < x < 35cm. The simulation does not make sense.
+- If the speed setup of a pedestrian is bigger then 12.0 m/s (world record). This is possible  an error.

Documentation/contributing/Writing Changelog Entries.md

+# Writing Changelog Entries
+
+## Introduction
+
+A good changelog entry should be descriptive and concise. It should explain the change to a reader who has **zero** context about the change. Each change should be categorized into one of the following types: `added`, `removed`, `changed`, `fixed`, `performance`, `security`, `deprecated` or `other`.
+
+- **Bad:** Highlight agents.
+- **Good:** In class `OnlineVisualization`, highlight the agent which was selected with left-mouse button.
+
+The first example doest not provide any context where the change was made or what benefit it brings to the user.
+
+## Writing into Changelog.md
+
+1. Each new version number gets an own section prefixed with `#` and a date, e.g., `# v0.1 (2018-01-31)`.
+   Notes:
+   * Unreleased versions should be marked explicitly, e.g., `# 0.1 (unreleased)`.