Merge branch 'master' of gitlab.lrz.de:vadere/vadere

.gitignore

 # Build artifacts, log and preference files
 *.out
 *.preferences.xml
+**/current_commit_hash.txt
 bin/
 swing-inspector-linux-1.2.3/
 target/
@@ -39,14 +40,11 @@ Tools/VadereAnalysisTools/VadereAnalysisTool/dist/
 # Jupyter Notebooks
 **/.ipynb_checkpoints
 
-#model test output
-VadereModelTests/**/output
-VadereModelTests/*_private
-VadereModelCalibration/**/output
-VadereModelTests/**/legacy
+# Test output
+Scenarios/**/output
+Scenarios/**/*_private
+Scenarios/**/**/legacy
 VadereUtils/output/**
-VadereModelTests/*_private
-**/current_commit_hash.txt
 
 # Operating system files
 .DS_Store

.gitlab-ci.yml

@@ -28,10 +28,6 @@ variables:
     EIKMESH_PACKAGE_NAME_BRANCHES: "eikmesh.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip"
 
 # Stage Definitions
-# Watch out: integration tests and the seed tests run after deployment, because
-#   currently tests fail very often because of timeouts. It is not clear if
-#   Vadere has slowed down somehow or the test environment is not reliable
-#   (i.e.,the virtual machines). We have to track that!
 stages:
     - unit_test
     - integration_test
@@ -52,6 +48,7 @@ stages:
     # Skip OpenCL tests by using "-Dtest=!Test1,!Test2,..." because GitLab
     # runners do not support OpenCL.
     script:
+        - rm -f ~/.config/vadere.conf
         - mvn clean
         - mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel,!TestLWJGL test
         - python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py
@@ -65,7 +62,7 @@ stages:
 .template_scenario_files:
     stage: integration_test
     script:
-        - rm ~/.config/vadere.conf
+        - rm -f ~/.config/vadere.conf
         - mvn clean
         - mvn -Dmaven.test.skip=true package
         - python3 Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py
@@ -81,7 +78,7 @@ stages:
     script:
         - mvn clean
         - mvn -Dmaven.test.skip=true package
-        - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} CHANGELOG.md README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
+        - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} CHANGELOG.md README.md Scenarios/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
         - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/${VADERE_PACKAGE_NAME_BRANCHES}
         - python3 -m zipfile -c ${EIKMESH_PACKAGE_NAME_BRANCHES} VadereMeshing/README.md VadereMeshing/target/meshing-0.1-SNAPSHOT.jar
         - scp ${EIKMESH_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/eikmesh/${EIKMESH_PACKAGE_NAME_BRANCHES}
@@ -95,7 +92,7 @@ stages:
     script:
         - mvn clean
         - mvn -Dmaven.test.skip=true package
-        - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_RELEASES} CHANGELOG.md README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
+        - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_RELEASES} CHANGELOG.md README.md Scenarios/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
         - scp ${VADERE_PACKAGE_NAME_RELEASES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/stable/${VADERE_PACKAGE_NAME_RELEASES}
     # Run job only for "tags" (usually on the "stable" branch). Watch out: Multiple "only" tags are ORed together.
     # See: https://gitlab.com/gitlab-org/gitlab-ce/issues/27818
@@ -108,7 +105,7 @@ stages:
     script:
         - mvn clean
         - mvn -Dmaven.test.skip=true package
-        - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} CHANGELOG.md README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
+        - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} CHANGELOG.md README.md Scenarios/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
         - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME_BRANCHES}
     when: manual
 
@@ -129,7 +126,7 @@ stages:
 
 # Job Definitions
 
-## Jobs for GNU/Linux runner (which is labelled with tag "linux")
+## Jobs for GNU/Linux runner (which is labeled with tag "linux")
 run_unit_tests_on_linux:
     extends: .template_unit_tests
     tags:
@@ -169,7 +166,7 @@ deploy_branch_on_linux:
         name: branches/${CI_COMMIT_REF_NAME}/linux
         url: ${VADERE_DEPLOYMENT_BASE_URL}/branches/vadere.${CI_COMMIT_REF_NAME}.${CI_RUNNER_TAGS}.zip
 
-## Jobs for Windows runner (which is labelled with tag "windows")
+## Jobs for Windows runner (which is labeled with tag "windows")
 run_unit_tests_on_windows:
     extends: .template_unit_tests
     tags:

CHANGELOG.md

@@ -14,6 +14,11 @@
 
 - `FootStepProcessor` interpolates the pedestrian's foot step to obtain a more precise position.  
 Was previously known as `PedestrianFootStepProcessor`
+- Use following shortcuts for zooming and scrolling in the topography creator:
+  * Ctrl + Mouse Wheel Scroll: Zoom in/out.
+  * Mouse Wheel Scroll: Scroll vertically.
+  * Shift + Mouse Wheel Scroll: Scroll horizontally.
+  * Use Alt key to decrease the step size while scrolling.
 
 # v1.4 (2019-09-05)
 
@@ -111,7 +116,7 @@ Was previously known as `PedestrianFootStepProcessor`
   * The new scenario element can be selected in `TopographyCreator` via the "emergency exit" button.
   * The new scenario element is also taken into account by `SettingsDialaog` and `TikzGenerator`.
 - Configured 1-click-deployment in ".gitlab-ci.yml".
-  * In short: Vadere is packaged as a single ZIP file containing following build artifacts: README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
+  * In short: Vadere is packaged as a single ZIP file containing following build artifacts: README.md Scenarios/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
   * Vadere is packaged for GNU/Linux and Microsoft Windows.
   * The ZIP file can be accessed on the website via: http://www.vadere.org/releases/
   * The website's filesystem contains three subdirectories for releases:

CONTRIBUTING.md

@@ -7,7 +7,7 @@ This guide explains the repository structure, how to set up the development envi
 The repository contains following `files` and `folders`:
 
 - The Vadere source code: divided into the sofware modules `VadereGui`, `VadereMeshing`, `VaderSimulator`, `VadereState`, `VadereUtils`
-- `VadereModelTests`: pre-shipped tests for different locomotion models (e.g., gradient navigation model, optimal steps model and the social force model)
+- `Scenarios`: pre-shipped tests for different purposes and different locomotion models (e.g., gradient navigation model, optimal steps model and the social force model)
 - `Tools`: scripts which are executing during the continuous integration phase.
 - `.gitlab`: templates for creating issues in the Vadere [issue tracker](https://gitlab.lrz.de/vadere/vadere/issues) (this files are implicitly used by GitLab).
 - `.gitlab-ci.yml`: instructions which are executed during the [continuous integration pipeline](https://docs.gitlab.com/ee/ci/quick_start/).

README.md

@@ -42,7 +42,7 @@ The ZIP file contains:
 * **README.md** - this README file. 
 * **vadere-gui.jar** - provides the GUI version of Vadere.
 * **vadere-console.jar** - provides the command line version of Vadere and allows easy integration into other applications.
-* **VadereModelTests** - contains test scenarios for pedestrian locomotion models. Note: The tests are also useful for a "getting started" (see below "Run Built-In Examples" for details).
+* **Scenarios** - contains test scenarios for pedestrian locomotion models. Note: The tests are also useful for a "getting started" (see below "Run Built-In Examples" for details).
 
 ### Run the Application
 
@@ -50,11 +50,11 @@ Open a terminal and enter `path/to/openjdk/java -jar vadere-gui.jar`.
 
 ### Run Built-In Examples
 
-With the following steps, you can run a simulation with one of the built-in examples from [VadereModelTests](VadereModelTests):
+With the following steps, you can run a simulation with one of the built-in examples from [Scenarios](Scenarios):
 
 - Start Vadere 
 - Click *Project* > *Open* 
-- Choose `vadere.project` of one of the test projects, e.g. [TestOSM](https://gitlab.lrz.de/vadere/vadere/tree/master/VadereModelTests/TestOSM) and click *open*
+- Choose `vadere.project` of one of the test projects, e.g. [TestOSM](https://gitlab.lrz.de/vadere/vadere/tree/master/Scenarios/ModelTests/TestOSM) and click *open*
 - Select the scenario on the left and press *run selected scenario*
 
 ## Build from Source