diff --git a/.gitignore b/.gitignore index 58b371d082b04dc106b0d9af7e71dc7dc5566bb2..f9b4c7b80bb99c5b3c784affca3bafb9deea1ed5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # 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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4adc1552c6f2aaf7beb7defe3795b1e4a10b337..a4b170149eefac086d6788f6a767c52da6d6e475 100644 --- a/.gitlab-ci.yml +++ b/.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: diff --git a/CHANGELOG.md b/CHANGELOG.md index e82bb50ca009aacee0c778d9101054a6e2f3a1fb..f8c087cc758e590f9d3d266fb79d7dc82ab58035 100644 --- a/CHANGELOG.md +++ b/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: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index abd2ea1b28096005652fdf334771103f710a83bf..af3c34fe4d12cbb19cf5ddb6223daef06bd6248d 100644 --- a/CONTRIBUTING.md +++ b/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/). diff --git a/README.md b/README.md index cc23db95ce3eefc15515e06b7bd733756f5ee43f..1afb4a023ef49cbe7a29f1783a9434fd24ad62d2 100644 --- a/README.md +++ b/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 diff --git a/VadereScenarios/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario b/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario similarity index 100% rename from VadereScenarios/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario rename to Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario diff --git a/VadereScenarios/HM_stairs_ModSem_2013_14/vadere.project b/Scenarios/Demos/HM_stairs_ModSem_2013_14/vadere.project similarity index 100% rename from VadereScenarios/HM_stairs_ModSem_2013_14/vadere.project rename to Scenarios/Demos/HM_stairs_ModSem_2013_14/vadere.project diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/figures/01-NarrowedStreet-Pollichstrasse.pdf b/Scenarios/Demos/OPMOPS-Kaiserslautern/figures/01-NarrowedStreet-Pollichstrasse.pdf similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/figures/01-NarrowedStreet-Pollichstrasse.pdf rename to Scenarios/Demos/OPMOPS-Kaiserslautern/figures/01-NarrowedStreet-Pollichstrasse.pdf diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/figures/02-VaryingPedestrianNumber-RichardWagnerStrasse.pdf b/Scenarios/Demos/OPMOPS-Kaiserslautern/figures/02-VaryingPedestrianNumber-RichardWagnerStrasse.pdf similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/figures/02-VaryingPedestrianNumber-RichardWagnerStrasse.pdf rename to Scenarios/Demos/OPMOPS-Kaiserslautern/figures/02-VaryingPedestrianNumber-RichardWagnerStrasse.pdf diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario b/Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario rename to Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario b/Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario rename to Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario b/Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario rename to Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario b/Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario rename to Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario b/Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario rename to Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario b/Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario rename to Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario b/Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario rename to Scenarios/Demos/OPMOPS-Kaiserslautern/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario diff --git a/VadereScenarios/OPMOPS-Kaiserslautern/vadere.project b/Scenarios/Demos/OPMOPS-Kaiserslautern/vadere.project similarity index 100% rename from VadereScenarios/OPMOPS-Kaiserslautern/vadere.project rename to Scenarios/Demos/OPMOPS-Kaiserslautern/vadere.project diff --git a/VadereScenarios/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario similarity index 100% rename from VadereScenarios/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario rename to Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario diff --git a/VadereScenarios/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario similarity index 100% rename from VadereScenarios/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario rename to Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario diff --git a/VadereScenarios/OSM-GPU/vadere.project b/Scenarios/Demos/OSM-GPU/vadere.project similarity index 100% rename from VadereScenarios/OSM-GPU/vadere.project rename to Scenarios/Demos/OSM-GPU/vadere.project diff --git a/VadereScenarios/bus_station/scenarios/bus_station.scenario b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario similarity index 100% rename from VadereScenarios/bus_station/scenarios/bus_station.scenario rename to Scenarios/Demos/bus_station/scenarios/bus_station.scenario diff --git a/VadereScenarios/bus_station/vadere.project b/Scenarios/Demos/bus_station/vadere.project similarity index 100% rename from VadereScenarios/bus_station/vadere.project rename to Scenarios/Demos/bus_station/vadere.project diff --git a/VadereScenarios/roVer/scenarios/map_mf_small_2.config b/Scenarios/Demos/roVer/scenarios/map_mf_small_2.config similarity index 100% rename from VadereScenarios/roVer/scenarios/map_mf_small_2.config rename to Scenarios/Demos/roVer/scenarios/map_mf_small_2.config diff --git a/VadereScenarios/roVer/scenarios/map_mf_small_2.osm b/Scenarios/Demos/roVer/scenarios/map_mf_small_2.osm similarity index 100% rename from VadereScenarios/roVer/scenarios/map_mf_small_2.osm rename to Scenarios/Demos/roVer/scenarios/map_mf_small_2.osm diff --git a/VadereScenarios/roVer/scenarios/map_mf_small_2.scenario b/Scenarios/Demos/roVer/scenarios/map_mf_small_2.scenario similarity index 100% rename from VadereScenarios/roVer/scenarios/map_mf_small_2.scenario rename to Scenarios/Demos/roVer/scenarios/map_mf_small_2.scenario diff --git a/VadereScenarios/roVer/scenarios/mf_small.scenario b/Scenarios/Demos/roVer/scenarios/mf_small.scenario similarity index 100% rename from VadereScenarios/roVer/scenarios/mf_small.scenario rename to Scenarios/Demos/roVer/scenarios/mf_small.scenario diff --git a/VadereScenarios/roVer/scenarios/mf_small_2.scenario b/Scenarios/Demos/roVer/scenarios/mf_small_2.scenario similarity index 100% rename from VadereScenarios/roVer/scenarios/mf_small_2.scenario rename to Scenarios/Demos/roVer/scenarios/mf_small_2.scenario diff --git a/VadereScenarios/roVer/scenarios/mf_small_simple.scenario b/Scenarios/Demos/roVer/scenarios/mf_small_simple.scenario similarity index 100% rename from VadereScenarios/roVer/scenarios/mf_small_simple.scenario rename to Scenarios/Demos/roVer/scenarios/mf_small_simple.scenario diff --git a/VadereScenarios/roVer/scenarios/roVerTest001.scenario b/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario similarity index 100% rename from VadereScenarios/roVer/scenarios/roVerTest001.scenario rename to Scenarios/Demos/roVer/scenarios/roVerTest001.scenario diff --git a/VadereScenarios/roVer/scenarios/scenario001.scenario b/Scenarios/Demos/roVer/scenarios/scenario001.scenario similarity index 100% rename from VadereScenarios/roVer/scenarios/scenario001.scenario rename to Scenarios/Demos/roVer/scenarios/scenario001.scenario diff --git a/VadereScenarios/roVer/scenarios/scenario002.scenario b/Scenarios/Demos/roVer/scenarios/scenario002.scenario similarity index 100% rename from VadereScenarios/roVer/scenarios/scenario002.scenario rename to Scenarios/Demos/roVer/scenarios/scenario002.scenario diff --git a/VadereScenarios/roVer/vadere.project b/Scenarios/Demos/roVer/vadere.project similarity index 100% rename from VadereScenarios/roVer/vadere.project rename to Scenarios/Demos/roVer/vadere.project diff --git a/VadereModelCalibration/.gitkeep b/Scenarios/ModelCalibration/.gitkeep similarity index 100% rename from VadereModelCalibration/.gitkeep rename to Scenarios/ModelCalibration/.gitkeep diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario diff --git a/VadereModelCalibration/TestOSMGroup_calibration/vadere.project b/Scenarios/ModelCalibration/TestOSMGroup_calibration/vadere.project similarity index 100% rename from VadereModelCalibration/TestOSMGroup_calibration/vadere.project rename to Scenarios/ModelCalibration/TestOSMGroup_calibration/vadere.project diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario rename to Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario diff --git a/VadereModelCalibration/TestOSM_calibration/vadere.project b/Scenarios/ModelCalibration/TestOSM_calibration/vadere.project similarity index 100% rename from VadereModelCalibration/TestOSM_calibration/vadere.project rename to Scenarios/ModelCalibration/TestOSM_calibration/vadere.project diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario diff --git a/VadereModelCalibration/TestOSM_zhang-2011/vadere.project b/Scenarios/ModelCalibration/TestOSM_zhang-2011/vadere.project similarity index 100% rename from VadereModelCalibration/TestOSM_zhang-2011/vadere.project rename to Scenarios/ModelCalibration/TestOSM_zhang-2011/vadere.project diff --git a/VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario similarity index 100% rename from VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario rename to Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario diff --git a/VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario b/Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario similarity index 100% rename from VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario rename to Scenarios/ModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario diff --git a/VadereModelTests/TestBHM/vadere.project b/Scenarios/ModelTests/TestBHM/vadere.project similarity index 100% rename from VadereModelTests/TestBHM/vadere.project rename to Scenarios/ModelTests/TestBHM/vadere.project diff --git a/VadereModelTests/TestEvents/BangEvent/maps/kaiserslautern_guimaraes_platz.osm b/Scenarios/ModelTests/TestEvents/BangEvent/maps/kaiserslautern_guimaraes_platz.osm similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/maps/kaiserslautern_guimaraes_platz.osm rename to Scenarios/ModelTests/TestEvents/BangEvent/maps/kaiserslautern_guimaraes_platz.osm diff --git "a/VadereModelTests/TestEvents/BangEvent/maps/kaiserslautern_pollichstra\303\237e.json" "b/Scenarios/ModelTests/TestEvents/BangEvent/maps/kaiserslautern_pollichstra\303\237e.json" similarity index 100% rename from "VadereModelTests/TestEvents/BangEvent/maps/kaiserslautern_pollichstra\303\237e.json" rename to "Scenarios/ModelTests/TestEvents/BangEvent/maps/kaiserslautern_pollichstra\303\237e.json" diff --git a/VadereModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario b/Scenarios/ModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario rename to Scenarios/ModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario diff --git a/VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario b/Scenarios/ModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario rename to Scenarios/ModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario diff --git a/VadereModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario b/Scenarios/ModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario rename to Scenarios/ModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario diff --git a/VadereModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario b/Scenarios/ModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario rename to Scenarios/ModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario diff --git a/VadereModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario b/Scenarios/ModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario rename to Scenarios/ModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario diff --git a/VadereModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario b/Scenarios/ModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario rename to Scenarios/ModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario diff --git a/VadereModelTests/TestEvents/BangEvent/vadere.project b/Scenarios/ModelTests/TestEvents/BangEvent/vadere.project similarity index 100% rename from VadereModelTests/TestEvents/BangEvent/vadere.project rename to Scenarios/ModelTests/TestEvents/BangEvent/vadere.project diff --git a/VadereModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario b/Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario rename to Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario diff --git a/VadereModelTests/TestEvents/DifferentEvents/scenarios/02_wait_event_osm_event_driven.scenario b/Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/02_wait_event_osm_event_driven.scenario similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/scenarios/02_wait_event_osm_event_driven.scenario rename to Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/02_wait_event_osm_event_driven.scenario diff --git a/VadereModelTests/TestEvents/DifferentEvents/scenarios/03_wait_event_recurring_osm_sequential.scenario b/Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/03_wait_event_recurring_osm_sequential.scenario similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/scenarios/03_wait_event_recurring_osm_sequential.scenario rename to Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/03_wait_event_recurring_osm_sequential.scenario diff --git a/VadereModelTests/TestEvents/DifferentEvents/scenarios/04_wait_in_area_event_osm_sequential.scenario b/Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/04_wait_in_area_event_osm_sequential.scenario similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/scenarios/04_wait_in_area_event_osm_sequential.scenario rename to Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/04_wait_in_area_event_osm_sequential.scenario diff --git a/VadereModelTests/TestEvents/DifferentEvents/scenarios/05_wait_in_area_event_bhm.scenario b/Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/05_wait_in_area_event_bhm.scenario similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/scenarios/05_wait_in_area_event_bhm.scenario rename to Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/05_wait_in_area_event_bhm.scenario diff --git a/VadereModelTests/TestEvents/DifferentEvents/scenarios/06_bang_event_osm_sequential.scenario b/Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/06_bang_event_osm_sequential.scenario similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/scenarios/06_bang_event_osm_sequential.scenario rename to Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/06_bang_event_osm_sequential.scenario diff --git a/VadereModelTests/TestEvents/DifferentEvents/scenarios/07_bang_event_osm_event_driven.scenario b/Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/07_bang_event_osm_event_driven.scenario similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/scenarios/07_bang_event_osm_event_driven.scenario rename to Scenarios/ModelTests/TestEvents/DifferentEvents/scenarios/07_bang_event_osm_event_driven.scenario diff --git a/VadereModelTests/TestEvents/DifferentEvents/vadere.project b/Scenarios/ModelTests/TestEvents/DifferentEvents/vadere.project similarity index 100% rename from VadereModelTests/TestEvents/DifferentEvents/vadere.project rename to Scenarios/ModelTests/TestEvents/DifferentEvents/vadere.project diff --git a/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario diff --git a/VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario similarity index 100% rename from VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario rename to Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario diff --git a/VadereModelTests/TestGNM/vadere.project b/Scenarios/ModelTests/TestGNM/vadere.project similarity index 100% rename from VadereModelTests/TestGNM/vadere.project rename to Scenarios/ModelTests/TestGNM/vadere.project diff --git a/VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario diff --git a/VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario b/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario diff --git a/VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario diff --git a/VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario b/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario diff --git a/VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario diff --git a/VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario diff --git a/VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario diff --git a/VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario similarity index 100% rename from VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario rename to Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario diff --git a/VadereModelTests/TestOSM/vadere.project b/Scenarios/ModelTests/TestOSM/vadere.project similarity index 100% rename from VadereModelTests/TestOSM/vadere.project rename to Scenarios/ModelTests/TestOSM/vadere.project diff --git a/VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario diff --git a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario similarity index 100% rename from VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario rename to Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario diff --git a/VadereModelTests/TestOSMGroup/vadere.project b/Scenarios/ModelTests/TestOSMGroup/vadere.project similarity index 100% rename from VadereModelTests/TestOSMGroup/vadere.project rename to Scenarios/ModelTests/TestOSMGroup/vadere.project diff --git a/VadereModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario similarity index 100% rename from VadereModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario rename to Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario diff --git a/VadereModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario similarity index 100% rename from VadereModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario rename to Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario diff --git a/VadereModelTests/TestOVM/scenarios/testtrafficlight.scenario b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario similarity index 100% rename from VadereModelTests/TestOVM/scenarios/testtrafficlight.scenario rename to Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario diff --git a/VadereModelTests/TestOVM/vadere.project b/Scenarios/ModelTests/TestOVM/vadere.project similarity index 100% rename from VadereModelTests/TestOVM/vadere.project rename to Scenarios/ModelTests/TestOVM/vadere.project diff --git a/VadereModelTests/TestRSM/scenarios/Reynolds_test.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario similarity index 100% rename from VadereModelTests/TestRSM/scenarios/Reynolds_test.scenario rename to Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test.scenario diff --git a/VadereModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario b/Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario similarity index 100% rename from VadereModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario rename to Scenarios/ModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario diff --git a/VadereModelTests/TestRSM/vadere.project b/Scenarios/ModelTests/TestRSM/vadere.project similarity index 100% rename from VadereModelTests/TestRSM/vadere.project rename to Scenarios/ModelTests/TestRSM/vadere.project diff --git a/VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_2.backup b/Scenarios/ModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_2.backup similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_2.backup rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_2.backup diff --git a/VadereModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_4.backup b/Scenarios/ModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_4.backup similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_4.backup rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_09_publicRoom_sfm1_4.backup diff --git a/VadereModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario b/Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario diff --git a/VadereModelTests/TestSFM/scenarios/rimea_11_exitSelection_sfm1.backup b/Scenarios/ModelTests/TestSFM/scenarios/rimea_11_exitSelection_sfm1.backup similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_11_exitSelection_sfm1.backup rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_11_exitSelection_sfm1.backup diff --git a/VadereModelTests/TestSFM/scenarios/rimea_12_evacuation_sfm1.backup b/Scenarios/ModelTests/TestSFM/scenarios/rimea_12_evacuation_sfm1.backup similarity index 100% rename from VadereModelTests/TestSFM/scenarios/rimea_12_evacuation_sfm1.backup rename to Scenarios/ModelTests/TestSFM/scenarios/rimea_12_evacuation_sfm1.backup diff --git a/VadereModelTests/TestSFM/vadere.project b/Scenarios/ModelTests/TestSFM/vadere.project similarity index 100% rename from VadereModelTests/TestSFM/vadere.project rename to Scenarios/ModelTests/TestSFM/vadere.project diff --git a/VadereModelTests/TestSalientBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/12-CounterFlow-SBEnabled.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/12-CounterFlow-SBEnabled.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/12-CounterFlow-SBEnabled.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/12-CounterFlow-SBEnabled.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/13-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/13-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/13-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/13-Test-TargetChanger-DoesNotChangeTargetIfProbabilityIsZero.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/14-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/14-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/14-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/14-Test-TargetChanger-ChangesTargetIfProbabilityIsOne.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/15-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/15-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/15-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/15-Test-TargetChanger-ChangesTargetIfProbabilityIsAHalf.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/16-Test-TargetChanger-ChangesToDynamicTarget.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/16-Test-TargetChanger-ChangesToDynamicTarget.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/16-Test-TargetChanger-ChangesToDynamicTarget.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/16-Test-TargetChanger-ChangesToDynamicTarget.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/17-Test-SpeedInAreaProcessor-SpeedByHeight.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/17-Test-SpeedInAreaProcessor-SpeedByHeight.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/17-Test-SpeedInAreaProcessor-SpeedByHeight.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/17-Test-SpeedInAreaProcessor-SpeedByHeight.scenario diff --git a/VadereModelTests/TestSalientBehavior/scenarios/18-Test-SpeedInAreaProcessor-SpeedByWidth.scenario b/Scenarios/ModelTests/TestSalientBehavior/scenarios/18-Test-SpeedInAreaProcessor-SpeedByWidth.scenario similarity index 100% rename from VadereModelTests/TestSalientBehavior/scenarios/18-Test-SpeedInAreaProcessor-SpeedByWidth.scenario rename to Scenarios/ModelTests/TestSalientBehavior/scenarios/18-Test-SpeedInAreaProcessor-SpeedByWidth.scenario diff --git a/VadereModelTests/TestSalientBehavior/vadere.project b/Scenarios/ModelTests/TestSalientBehavior/vadere.project similarity index 100% rename from VadereModelTests/TestSalientBehavior/vadere.project rename to Scenarios/ModelTests/TestSalientBehavior/vadere.project diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario diff --git a/VadereModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario b/Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario similarity index 100% rename from VadereModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario rename to Scenarios/ModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario diff --git a/VadereModelTests/TestStairs/vadere.project b/Scenarios/ModelTests/TestStairs/vadere.project similarity index 100% rename from VadereModelTests/TestStairs/vadere.project rename to Scenarios/ModelTests/TestStairs/vadere.project diff --git a/VadereOptimizationTests/TestNelderMead/scenarios/counterflow.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario similarity index 100% rename from VadereOptimizationTests/TestNelderMead/scenarios/counterflow.scenario rename to Scenarios/OptimizationTests/TestNelderMead/scenarios/counterflow.scenario diff --git a/VadereOptimizationTests/TestNelderMead/scenarios/labyrinth.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario similarity index 100% rename from VadereOptimizationTests/TestNelderMead/scenarios/labyrinth.scenario rename to Scenarios/OptimizationTests/TestNelderMead/scenarios/labyrinth.scenario diff --git a/VadereOptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario similarity index 100% rename from VadereOptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario rename to Scenarios/OptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario diff --git a/VadereOptimizationTests/TestNelderMead/scenarios/s2ucre.scenario b/Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario similarity index 100% rename from VadereOptimizationTests/TestNelderMead/scenarios/s2ucre.scenario rename to Scenarios/OptimizationTests/TestNelderMead/scenarios/s2ucre.scenario diff --git a/VadereOptimizationTests/TestNelderMead/vadere.conf b/Scenarios/OptimizationTests/TestNelderMead/vadere.conf similarity index 100% rename from VadereOptimizationTests/TestNelderMead/vadere.conf rename to Scenarios/OptimizationTests/TestNelderMead/vadere.conf diff --git a/VadereOptimizationTests/TestNelderMead/vadere.project b/Scenarios/OptimizationTests/TestNelderMead/vadere.project similarity index 100% rename from VadereOptimizationTests/TestNelderMead/vadere.project rename to Scenarios/OptimizationTests/TestNelderMead/vadere.project diff --git a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py index 6a0e8222232e98f556ccf937d80e7fd2c6cddc2d..8dee261c0b362b6767782e2bc70821d1355fca06 100644 --- a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py +++ b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py @@ -1,5 +1,5 @@ # Use "vadere-console.jar", which is created by "mvn package", to run all -# scenario files under "VadereModelTests" subdirectory. +# scenario files under "Scenarios/ModelTests" subdirectory. # # Note: script contains some print statements so that progress can be tracked # a little bit while script is running in continuous integration pipeline. @@ -26,7 +26,7 @@ def parse_command_line_arguments(): parser.add_argument("scenario", type=str, nargs="?", help="Run only the given scenario file and not all. E.g., " - "\"VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario\"") + "\"Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario\"") return parser.parse_args() @@ -49,14 +49,16 @@ def run_all_model_tests(): excluded_scenarios = ["TestOVM", "output", "legacy"] excluded_scenarios.extend(long_running_scenarios) - scenario_files_regular_length = find_scenario_files(path="VadereModelTests", exclude_patterns=excluded_scenarios) + scenario_base_path = os.path.join("Scenarios" , "ModelTests") + + scenario_files_regular_length = find_scenario_files(path=scenario_base_path, exclude_patterns=excluded_scenarios) passed_and_failed_scenarios = run_scenario_files_with_vadere_console( scenario_files_regular_length, scenario_timeout_in_sec=short_timeout_in_seconds) for scenario in long_running_scenarios: search_pattern = "*" + scenario + "*.scenario" - scenario_files_long = find_scenario_files(path="VadereModelTests", scenario_search_pattern=search_pattern) + scenario_files_long = find_scenario_files(path=scenario_base_path, scenario_search_pattern=search_pattern) tmp_passed_and_failed_scenarios = run_scenario_files_with_vadere_console( scenario_files_long, scenario_timeout_in_sec=long_timeout_in_seconds) @@ -68,10 +70,10 @@ def run_all_model_tests(): def run_all_optimization_tests(): - scenario_files = find_scenario_files(path="VadereOptimizationTests") + scenario_files = find_scenario_files(path=os.path.join("Scenarios", "OptimizationTests")) # enables flag to compare optimization with brute force solution - config_filepath = os.path.join("VadereOptimizationTests", "TestNelderMead", "vadere.conf") + config_filepath = os.path.join("Scenarios", "OptimizationTests", "TestNelderMead", "vadere.conf") # NOTE: it is likely that the set config file is not required by new optimization tests # long_timeout, because the brute force is expensive. @@ -129,9 +131,9 @@ def run_scenario_files_with_vadere_console(scenario_files, vadere_console="Vader try: print(f"Running scenario file ({i + 1}/{total_scenario_files}): {scenario_file}") - # A scenario filename has the form "VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario" - # Use second-level directory as subdirectory for logging (e.g., "TestOSM"). - log_sub_dir = scenario_file.split(os.path.sep)[1] + # A scenario filename has the form "Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario" + # Use third-level directory as subdirectory for logging (e.g., "TestOSM"). + log_sub_dir = scenario_file.split(os.path.sep)[2] log_dir = os.path.join(".", log_base_dir, log_sub_dir) makedirs_if_non_existing(log_dir) @@ -219,12 +221,14 @@ def result_dict_print_summary(passed_and_failed_scenarios): failed_summary = passed_and_failed_scenarios["failed_summary"] if result_dict_has_failed_tests(passed_and_failed_scenarios): + print("") print("##################") print("# Failed Summary #") print("##################") for line in failed_summary: print(line) + print("") print("###########") print("# Summary #") print("###########") diff --git a/Tools/Notebooks/GroupModel.ipynb b/Tools/Notebooks/GroupModel.ipynb index b030de662b325d123ee058c97e2df72f2e08837f..f04b196108c10380b61fb97c6fa35a730d39a1f4 100644 --- a/Tools/Notebooks/GroupModel.ipynb +++ b/Tools/Notebooks/GroupModel.ipynb @@ -41,7 +41,7 @@ } ], "source": [ - "project = vat.VadereProject ('/home/luca/Programming/vadere/VadereModelTests/TestOSM_Group2')" + "project = vat.VadereProject ('/home/luca/Programming/vadere/Scenarios/ModelTests/TestOSM_Group2')" ] }, { diff --git a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_calibration-checkpoint.ipynb b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_calibration-checkpoint.ipynb index bc9b5cd4388f5e353d47add5399651a5b5e80551..5d23de8b848b3e76100a49d2757f3d2026542182 100644 --- a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_calibration-checkpoint.ipynb +++ b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_calibration-checkpoint.ipynb @@ -6,7 +6,7 @@ "source": [ "# Calibration of the Optimal Steps Model\n", "\n", - "This script is an attempt to recompute the results in silver-2016b page 51. The scenario [scenario](./../../../../VadereModelTests/TestOSM_calibration/rimea_04_calibration_osm.scenario) is based on the RiMEA-Test 4. We use the `Teleporter` to model a circular scenario and the parameter `useFreeSpaceOnly = false` to generate high densities. The following code plots all the necessary diagrams." + "This script is an attempt to recompute the results in silver-2016b page 51. The scenario [scenario](./../../../../Scenarios/ModelTests/TestOSM_calibration/rimea_04_calibration_osm.scenario) is based on the RiMEA-Test 4. We use the `Teleporter` to model a circular scenario and the parameter `useFreeSpaceOnly = false` to generate high densities. The following code plots all the necessary diagrams." ] }, { @@ -153,7 +153,7 @@ "metadata": {}, "outputs": [], "source": [ - "projectFolder = \"./../../../../VadereModelCalibration/TestOSM_calibration/\"\n", + "projectFolder = \"./../../../../Scenarios/ModelCalibration/TestOSM_calibration/\"\n", "project = VadereProject(projectFolder)\n", "#out = project.named_output.C_050_180_180_2018_11_26_16_30_29_355()'" ] diff --git a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_zhang-2011-checkpoint.ipynb b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_zhang-2011-checkpoint.ipynb index 72ca2dc80c58d38c1bd38f7422617df4e434a281..a33e939d69146595e3674f4fb708e7d574aad5d0 100644 --- a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_zhang-2011-checkpoint.ipynb +++ b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/.ipynb_checkpoints/OSM_zhang-2011-checkpoint.ipynb @@ -134,7 +134,7 @@ "metadata": {}, "outputs": [], "source": [ - "projectFolder = \"./../../../../VadereModelCalibration/TestOSM_zhang-2011/\"\n", + "projectFolder = \"./../../../../Scenarios/ModelCalibration/TestOSM_zhang-2011/\"\n", "project = VadereProject(projectFolder)\n", "#out = project.named_output.C_050_180_180_2018_11_26_16_30_29_355() " ] diff --git a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibration.ipynb b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibration.ipynb index 27c01ec2fc41d68652fe3471225e347818140cec..275cc52dfe0147ba3ff0937b8269b34559558b67 100644 --- a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibration.ipynb +++ b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibration.ipynb @@ -6,7 +6,7 @@ "source": [ "# Calibration of the Optimal Steps Model\n", "\n", - "This script is an attempt to recompute the results in silver-2016b page 51. The scenario [scenario](./../../../../VadereModelTests/TestOSM_calibration/rimea_04_calibration_osm.scenario) is based on the RiMEA-Test 4. We use the `Teleporter` to model a circular scenario and the parameter `useFreeSpaceOnly = false` to generate high densities. The following code plots all the necessary diagrams." + "This script is an attempt to recompute the results in silver-2016b page 51. The scenario [scenario](./../../../../Scenarios/ModelTests/TestOSM_calibration/rimea_04_calibration_osm.scenario) is based on the RiMEA-Test 4. We use the `Teleporter` to model a circular scenario and the parameter `useFreeSpaceOnly = false` to generate high densities. The following code plots all the necessary diagrams." ] }, { @@ -153,7 +153,7 @@ "metadata": {}, "outputs": [], "source": [ - "projectFolder = \"./../../../../VadereModelCalibration/TestOSM_calibration/\"\n", + "projectFolder = \"./../../../../Scenarios/ModelCalibration/TestOSM_calibration/\"\n", "project = VadereProject(projectFolder)\n", "#out = project.named_output.C_050_180_180_2018_11_26_16_30_29_355()'" ] diff --git a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb index 167f4d85020d027b8a37f04304417ae9e1a88e2c..22acf2b935f53f0cbf497f510f23ac473fba99a3 100644 --- a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb +++ b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb @@ -6,7 +6,7 @@ "source": [ "# Calibration of the Optimal Steps Model\n", "\n", - "This script is an attempt to recompute the results in silver-2016b page 51. The scenario [scenario](./../../../../VadereModelTests/TestOSM_calibration/rimea_04_calibration_osm.scenario) is based on the RiMEA-Test 4. We use the `Teleporter` to model a circular scenario and the parameter `useFreeSpaceOnly = false` to generate high densities. The following code plots all the necessary diagrams." + "This script is an attempt to recompute the results in silver-2016b page 51. The scenario [scenario](./../../../../Scenarios/ModelTests/TestOSM_calibration/rimea_04_calibration_osm.scenario) is based on the RiMEA-Test 4. We use the `Teleporter` to model a circular scenario and the parameter `useFreeSpaceOnly = false` to generate high densities. The following code plots all the necessary diagrams." ] }, { diff --git a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_zhang-2011.ipynb b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_zhang-2011.ipynb index 72ca2dc80c58d38c1bd38f7422617df4e434a281..a33e939d69146595e3674f4fb708e7d574aad5d0 100644 --- a/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_zhang-2011.ipynb +++ b/Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_zhang-2011.ipynb @@ -134,7 +134,7 @@ "metadata": {}, "outputs": [], "source": [ - "projectFolder = \"./../../../../VadereModelCalibration/TestOSM_zhang-2011/\"\n", + "projectFolder = \"./../../../../Scenarios/ModelCalibration/TestOSM_zhang-2011/\"\n", "project = VadereProject(projectFolder)\n", "#out = project.named_output.C_050_180_180_2018_11_26_16_30_29_355() " ] diff --git a/VadereGui/resources/messages.properties b/VadereGui/resources/messages.properties index 979626abbf8ba5f2ae796f3b3bcf3c76f557cdde..7211edb4f283f182a7bcdf953d9ac5d4d43a819d 100644 --- a/VadereGui/resources/messages.properties +++ b/VadereGui/resources/messages.properties @@ -395,4 +395,12 @@ Data.TrajectoryOrScenarioFile.NoData.text=No trajectory or scenario file found. ImageSizeDialog.title=Image size ImageSizeDialog.lblWidth.text=Width -ImageSizeDialog.lblHeight.text=Height \ No newline at end of file +ImageSizeDialog.lblHeight.text=Height + +MigrationAssistant.title=Migration Assistant +MigrationAssistant.Results.title=Migration to version +MigrationAssistant.Results.analyzed=Analyzed files +MigrationAssistant.Results.migrated=Migrated +MigrationAssistant.Results.upToDate=Already up to date +MigrationAssistant.Results.notMigratable=Not migratable +MigrationAssistant.Results.migratedInfo=Backed up original scenarios to folder \"legacy\" \ No newline at end of file diff --git a/VadereGui/resources/messages_de_DE.properties b/VadereGui/resources/messages_de_DE.properties index fef48f71cbf895a67da1356ea38f9ee73a6fced2..20ea63509be6c3c2fb84e9440dc176a687df529c 100644 --- a/VadereGui/resources/messages_de_DE.properties +++ b/VadereGui/resources/messages_de_DE.properties @@ -389,4 +389,12 @@ Data.TrajectoryOrScenarioFile.NoData.text=Keine Trajektorien- oder Szenario-Date ImageSizeDialog.title=Bildgr\u00f6\u00dfe ImageSizeDialog.lblWidth.text=Breite -ImageSizeDialog.lblHeight.text=H\u00f6he \ No newline at end of file +ImageSizeDialog.lblHeight.text=H\u00f6he + +MigrationAssistant.title=Migrations-Assistent +MigrationAssistant.Results.title=Migration zu Version +MigrationAssistant.Results.analyzed=Insgesamt analysiert +MigrationAssistant.Results.migrated=Migriert +MigrationAssistant.Results.upToDate=Bereits aktuell +MigrationAssistant.Results.notMigratable=Nicht migrierbar +MigrationAssistant.Results.migratedInfo=Original-Szenarien gesichert in Ordner \"legacy\" \ No newline at end of file diff --git a/VadereGui/src/org/vadere/gui/components/control/DefaultModeAdapter.java b/VadereGui/src/org/vadere/gui/components/control/DefaultModeAdapter.java index 62c473070eb7853e4986cb37c33b470f257a40a9..9a1fa7e0a7d2c5d34b502baa2b855bb897774cbc 100644 --- a/VadereGui/src/org/vadere/gui/components/control/DefaultModeAdapter.java +++ b/VadereGui/src/org/vadere/gui/components/control/DefaultModeAdapter.java @@ -68,23 +68,70 @@ public class DefaultModeAdapter implements IMode { panelModel.notifyObservers(); } + /** + * Use following shortcuts for zooming and scrolling: + * + * @param e + */ @Override public void mouseWheelMoved(MouseWheelEvent e) { - if (e.getWheelRotation() > 0) { - if (panelModel.zoomOut()) { - panelModel.notifyScaleListeners(); - panelModel.notifyObservers(); + if (e.isControlDown()) { + if (e.getWheelRotation() > 0) { + if (panelModel.zoomOut()) { + panelModel.notifyScaleListeners(); + panelModel.notifyObservers(); + } + delay(); + } else if (e.getWheelRotation() < 0) { + if (panelModel.zoomIn()) { + panelModel.notifyScaleListeners(); + panelModel.notifyObservers(); + } + delay(); } - delay(); - } else if (e.getWheelRotation() < 0) { - if (panelModel.zoomIn()) { - panelModel.notifyScaleListeners(); - panelModel.notifyObservers(); - } - delay(); + } else { + MouseWheelEvent scrollEvent = (e.isAltDown()) ? getSmallStepScrollEvent(e) : getBigStepScrollEvent(e); + panelModel.getScrollPane().dispatchEvent(scrollEvent); } } + private MouseWheelEvent getSmallStepScrollEvent(MouseWheelEvent baseEvent) { + MouseWheelEvent smallScrollEvent = new MouseWheelEvent( + (Component) baseEvent.getSource(), + baseEvent.getID(), + baseEvent.getWhen(), + baseEvent.getModifiersEx(), + baseEvent.getX(), + baseEvent.getY(), + baseEvent.getClickCount(), + baseEvent.isPopupTrigger(), + MouseWheelEvent.WHEEL_UNIT_SCROLL, + baseEvent.getScrollAmount(), + baseEvent.getWheelRotation()); + return smallScrollEvent; + } + + private MouseWheelEvent getBigStepScrollEvent(MouseWheelEvent baseEvent) { + MouseWheelEvent smallScrollEvent = new MouseWheelEvent( + (Component) baseEvent.getSource(), + baseEvent.getID(), + baseEvent.getWhen(), + baseEvent.getModifiersEx(), + baseEvent.getX(), + baseEvent.getY(), + baseEvent.getClickCount(), + baseEvent.isPopupTrigger(), + MouseWheelEvent.WHEEL_BLOCK_SCROLL, + baseEvent.getScrollAmount(), + baseEvent.getWheelRotation()); + return smallScrollEvent; + } + private void delay() { try { Thread.sleep(10); diff --git a/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java b/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java index 0c1da92ceb0418eae880f4d902fff8a25e923afa..fd41e7a78daf72519c736e022acd3579cf192ead 100644 --- a/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java +++ b/VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java @@ -48,6 +48,7 @@ public class OnlineVisualisationWindow extends JPanel implements Observer { mainPanel.setScrollPane(scrollPane); scrollPane.getViewport() .addChangeListener(new JViewportChangeListener(model, scrollPane.getVerticalScrollBar())); + model.addScrollPane(scrollPane); IViewportChangeListener viewportChangeListener = new ViewportChangeListener(model, scrollPane); model.addViewportChangeListener(viewportChangeListener); @@ -60,7 +61,7 @@ public class OnlineVisualisationWindow extends JPanel implements Observer { this.toolbar = new JToolBar("OnlineVisualizationToolbar"); toolbar.setFloatable(false); - // toolbar.setBorderPainted(false); + toolbar.setBorderPainted(false); toolbar.setAlignmentX(Component.LEFT_ALIGNMENT); toolbar.setAlignmentY(Component.TOP_ALIGNMENT); // TODO: Should this be really configurable in a config file? diff --git a/VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java b/VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java index 96285d889c4b83bcf063fe529d1ba2e392095f30..2c18e19da9fd6f78c5889907b672f57101e9fdec 100644 --- a/VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java +++ b/VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java @@ -286,7 +286,7 @@ public class PostvisualizationModel extends SimulationModel getPositions() { List positions = new ArrayList<>(); - trajectories.getAgents(getSimTimeInSec()).forEach(row -> toPosition(row)); + trajectories.getAgents(getSimTimeInSec()).forEach(row -> positions.add(toPosition(row))); return positions; } diff --git a/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java b/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java index 64440ff1d91826b686ebc9c28c9698dc1336dc9d..c3a3341915e1c90551f08ab5e8d576b6f17f36bb 100644 --- a/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java +++ b/VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java @@ -89,7 +89,7 @@ public class PostvisualizationWindow extends JPanel implements Observer, DropTar // 6. construct the toolbar toolbar = new JToolBar("Toolbar"); int toolbarSize = CONFIG.getInt("Gui.toolbar.size"); - toolbar.setPreferredSize(new Dimension(toolbarSize, toolbarSize)); + //toolbar.setPreferredSize(new Dimension(toolbarSize, toolbarSize)); toolbar.setBorderPainted(false); toolbar.setFloatable(false); toolbar.setAlignmentX(Component.LEFT_ALIGNMENT); diff --git a/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java b/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java index 887e4cb46c8899885f56200e35baf5c621071379..e713011d4e4072994a8eae51c2736f90d227218e 100644 --- a/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java +++ b/VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java @@ -1,8 +1,6 @@ package org.vadere.gui.projectview.control; - import org.vadere.gui.components.utils.Messages; -import org.vadere.gui.projectview.VadereApplication; import org.vadere.gui.projectview.model.ProjectViewModel; import org.vadere.gui.projectview.view.ProjectView; import org.vadere.gui.projectview.view.VDialogManager; @@ -14,6 +12,7 @@ import org.vadere.simulator.projects.migration.MigrationResult; import org.vadere.util.config.VadereConfig; import org.vadere.util.logging.Logger; +import javax.swing.*; import java.awt.event.ActionEvent; import java.io.IOException; import java.nio.file.Files; @@ -21,11 +20,7 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.prefs.Preferences; import java.util.stream.Collectors; -import java.util.stream.Stream; - -import javax.swing.*; public class ActionLoadProject extends AbstractAction { @@ -135,45 +130,47 @@ public class ActionLoadProject extends AbstractAction { SwingWorker worker = new SwingWorker() { @Override public Void doInBackground() { - int total = stats.total; - int migrated = stats.legacy; - int nonmigratable = stats.notmigratable; - int untouched = total - migrated - nonmigratable; - - // TODO pull this text from the language files - - String message = - "The migration assistant analyzed the " + total + " scenarios in the scenarios and output " + - "directories of this project and attempted to upgrade them to the latest version " - + Version.latest().label() + ".\n" + - "Log-files have been created in legacy/scenarios and legacy/output.\n\n"; - - if (untouched > 0) - message += "(" + untouched + "/" + total + ") of the scenarios were already up to date.\n\n"; - if (nonmigratable > 0) - message += "(" + nonmigratable + "/" + total - + ") scenarios could not automatically be upgraded and were moved to the legacy-folder. They can't be opened unless the upgrade is done manually.\n\n"; - if (migrated > 0) - message += "(" + migrated + "/" + total - + ") scenarios were successfully upgraded. The old versions were moved to the legacy-folder.\n\n"; + String migrationResult = String.format("%s %s:\n\n", + Messages.getString("MigrationAssistant.Results.title"), + Version.latest().label()); + migrationResult += String.join("\n", getMigrationResult(stats)); + + if (stats.legacy > 0) { + migrationResult += String.format("\n\n%s", Messages.getString("MigrationAssistant.Results.migratedInfo")); + } JOptionPane.showMessageDialog( ProjectView.getMainWindow(), - message, "JoltMigrationAssistant assistant", + migrationResult, Messages.getString("MigrationAssistant.title"), JOptionPane.INFORMATION_MESSAGE); + return null; } }; worker.execute(); - } else { - logger.info("Nothing to migrate all up to date " + stats); } - } catch (Exception e) { - JOptionPane.showMessageDialog(null, e.getMessage(), "JoltMigrationAssistant assistant", + JOptionPane.showMessageDialog(null, e.getMessage(), Messages.getString("MigrationAssistant.title"), JOptionPane.ERROR_MESSAGE); logger.error("could not loadFromFilesystem project: " + e.getMessage()); e.printStackTrace(); } } + + /** + * The "MigrationResult" class cannot access "Messages.getString(...)" + * because of avoiding cyclic dependencies between view and controller classes. + * Therefore, translate the migration results here. + */ + public static List getMigrationResult(MigrationResult migrationResult) { + List resultArray = new ArrayList<>(); + + String resultLineTemplate = "%s: %d"; + resultArray.add(String.format(resultLineTemplate, Messages.getString("MigrationAssistant.Results.analyzed"), migrationResult.total)); + resultArray.add(String.format(resultLineTemplate, Messages.getString("MigrationAssistant.Results.migrated"), migrationResult.legacy)); + resultArray.add(String.format(resultLineTemplate, Messages.getString("MigrationAssistant.Results.upToDate"), migrationResult.upToDate)); + resultArray.add(String.format(resultLineTemplate, Messages.getString("MigrationAssistant.Results.notMigratable"), migrationResult.notmigratable)); + + return resultArray; + } } diff --git a/VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java b/VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java index 7c877ae063e91610f52c2ea9b7f64051755e91f7..d063cb3bc74dc308a2ce5bcc8be0198d5ea230c1 100644 --- a/VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java +++ b/VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java @@ -81,9 +81,10 @@ public class TopographyWindow extends JPanel { toolbar = new ScenarioToolBar("Toolbar"); int toolbarSize = VadereConfig.getConfig().getInt("Gui.toolbar.size"); - toolbar.setPreferredSize(new Dimension(toolbarSize, toolbarSize)); - toolbar.setBorderPainted(false); - toolbar.setFloatable(false); + Dimension prefSize = new Dimension(toolbarSize, toolbarSize); + //toolbar.setPreferredSize(prefSize); + toolbar.setBorderPainted(true); + toolbar.setFloatable(true); toolbar.setAlignmentX(Component.LEFT_ALIGNMENT); toolbar.setAlignmentY(Component.TOP_ALIGNMENT); diff --git a/VadereMeshing/resources/poly/filled_chicken.poly b/VadereMeshing/resources/poly/filled_chicken.poly new file mode 100644 index 0000000000000000000000000000000000000000..f8dc8fbe8969238d09f08102b1bc0e5b8a6d0ef5 --- /dev/null +++ b/VadereMeshing/resources/poly/filled_chicken.poly @@ -0,0 +1,28 @@ +# nVertices dimension nAttributes boundaryMarker +8 2 0 0 +# vertexId x y +1 0.500000 0.500000 +2 34.500000 0.500000 +3 26.000000 21.000000 +4 26.000000 41.000000 +5 9.000000 41.000000 +6 9.000000 21.000000 +7 0.500000 59.500000 +8 34.500000 59.500000 +# +# nSegments boundaryMarker +8 0 +# lineId vertexId1 vertexId2 +1 2 8 +2 8 7 +3 7 1 +4 1 2 +5 3 4 +6 4 5 +7 5 6 +8 6 3 +# +# nHoles +1 +# vertexId x y (of a vertex which lies inside the hole) +1 17.500000 31.000000 \ No newline at end of file diff --git a/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/Parameters.java b/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/Parameters.java index 2b2571df32e81dd7ee7a93c72f0e159453d0e94b..3da4ffd10a1d5b3f91565a80357af40cf6fac0a1 100755 --- a/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/Parameters.java +++ b/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/Parameters.java @@ -15,11 +15,12 @@ public class Parameters { public final static boolean uniform = false; public final static String method = "Distmesh"; // "Distmesh" or "Density" public final static double qualityMeasurement = 0.85; + public final static double qualityConvergence = 0.001; public final static double MINIMUM = 0.25; public final static double DENSITYWEIGHT = 2; public final static int NPOINTS = 100000; public final static int SAMPLENUMBER = 10; public final static int SAMPLEDIVISION = 10; public final static int SEGMENTDIVISION = 0; - public final static int MAX_NUMBER_OF_STEPS = 100; + public final static int MAX_NUMBER_OF_STEPS = 250; } diff --git a/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/gen/GenEikMesh.java b/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/gen/GenEikMesh.java index fcf2d6ba954762a4e68d298f240ae243e744fa41..d59b95baa73b62a0c9a76598e1a4e11234382f21 100644 --- a/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/gen/GenEikMesh.java +++ b/VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/gen/GenEikMesh.java @@ -57,7 +57,7 @@ public class GenEikMesh private Collection fixPoints; private double scalingFactor; private double deps; - private static final int MAX_STEPS = 250; + private static final int MAX_STEPS = Parameters.MAX_NUMBER_OF_STEPS; private int nSteps; private double initialEdgeLen; private double maxMovement; @@ -301,6 +301,10 @@ public class GenEikMesh } + public Collection getFixVertices() { + return refiner.getFixPoints(); + } + public void initialize() { initializeStep(); } @@ -343,8 +347,8 @@ public class GenEikMesh public boolean isFinished() { synchronized (getMesh()) { - boolean converged = dQuality < 0.000000001; - return initializationFinished() && quality > Parameters.qualityMeasurement && converged || (maxMovement > 0 && maxMovement / initialEdgeLen < Parameters.DPTOL) || nSteps >= MAX_STEPS; + boolean converged = dQuality < Parameters.qualityConvergence; + return initializationFinished() && quality >= Parameters.qualityMeasurement && converged || (maxMovement > 0 && maxMovement / initialEdgeLen < Parameters.DPTOL) || nSteps >= MAX_STEPS; } } @@ -783,11 +787,11 @@ public class GenEikMesh V v1 = getMesh().getVertex(edge); V v2 = getMesh().getTwinVertex(edge); - if(!getMesh().isAtBoundary(v1) || !getMesh().isAtBoundary(v2)) { + if((!getMesh().isAtBoundary(v1) && !isFixPoint(v1)) || (!getMesh().isAtBoundary(v2) && !isFixPoint(v2))) { VPoint newPosition; - if(getMesh().isAtBoundary(v1)) { + if(getMesh().isAtBoundary(v1) || isFixPoint(v1)) { newPosition = new VPoint(v1.getX(), v1.getY()); - } else if(getMesh().isAtBoundary(v2)) { + } else if(getMesh().isAtBoundary(v2) || isFixPoint(v2)) { newPosition = new VPoint(v2.getX(), v2.getY()); } else { newPosition = new VPoint((v1.getX() + v2.getX()) * 0.5, (v1.getY() + v2.getY()) * 0.5); diff --git a/VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/EikonalSolverFMMTriangulation.java b/VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/EikonalSolverFMMTriangulation.java index dff69fe6569b3443cc4df5567765fbe9cb3fd7e9..1f9632dd0c1cd4f0b0bb2f29a8ff86c373f9ba08 100644 --- a/VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/EikonalSolverFMMTriangulation.java +++ b/VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/EikonalSolverFMMTriangulation.java @@ -116,11 +116,42 @@ public class EikonalSolverFMMTriangulation point.distance(p)); } } + /** + * Constructor for certain target points. + * + * @param timeCostFunction the time cost function t(x). Note F(x) = 1 / t(x). + * @param triangulation the triangulation the propagating wave moves on. + * @param targetVertices Points where the propagating wave starts i.e. points that are part of the target area. + */ + public EikonalSolverFMMTriangulation(@NotNull final ITimeCostFunction timeCostFunction, + @NotNull final IIncrementalTriangulation triangulation, + @NotNull final Collection targetVertices + ) { + this.triangulation = triangulation; + this.calculationFinished = false; + this.timeCostFunction = timeCostFunction; + this.narrowBand = new PriorityQueue<>(pointComparator); + this.targetVertices = new HashSet<>(); + this.distFunc = p -> IDistanceFunction.createToTargetPoints(targetVertices).apply(p); + + for(V vertex : targetVertices) { + this.targetVertices.add(vertex); + for(V neighbouringVertices : getMesh().getAdjacentVertexIt(vertex)) { + this.targetVertices.add(neighbouringVertices); + } + } + } + /** * Constructor for certain target shapes. * diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationResult.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationResult.java index 8bd06076ebbf121ee931d0a1b8eb75fe0c40d9e9..879cabc401076f14a6a9524e547d72186880abf4 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationResult.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/MigrationResult.java @@ -1,8 +1,11 @@ package org.vadere.simulator.projects.migration; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; public class MigrationResult { + public int total; public int upToDate; public int legacy; @@ -53,11 +56,15 @@ public class MigrationResult { @Override public String toString() { - return "MigrationResult{" + - "total=" + total + - ", upToDate=" + upToDate + - ", legacy=" + legacy + - ", notmigratable=" + notmigratable + - '}'; + List resultArray = new ArrayList<>(); + + String resultLineTemplate = "%s: %d"; + resultArray.add(String.format(resultLineTemplate, "analyzed", total)); + resultArray.add(String.format(resultLineTemplate, "migrated", legacy)); + resultArray.add(String.format(resultLineTemplate, "upToDate", upToDate)); + resultArray.add(String.format(resultLineTemplate, "notMigratable", notmigratable)); + + return String.join(", ", resultArray); } + } diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java index f5182b554c4993352dbd2fd0ee85d6c3125900d7..b9b0438f04cbed200df20f8cdd92931df1777983 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java @@ -31,7 +31,7 @@ public class MigrationUtil { public MigrationUtil() { dirMarker = createList("DO_NOT_MIGRATE", ".DO_NOT_MIGRATE"); treeMarker = createList("DO_NOT_MIGRATE_TREE", ".DO_NOT_MIGRATE_TREE", IOUtils.CORRUPT_DIR, IOUtils.LEGACY_DIR); - ignoreDirs = createList("VadereModelTests", "target", "Documentation"); + ignoreDirs = createList("Scenarios", "target", "Documentation"); } public static void main(String[] args) throws URISyntaxException, IOException { diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonMigrationAssistant.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonMigrationAssistant.java index e1fab1d8352cb3e33b635709b7e470748d599c86..d32f9a2c89c2a9c6bb3204979e034e06c83b5b80 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonMigrationAssistant.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonMigrationAssistant.java @@ -275,14 +275,14 @@ public class JsonMigrationAssistant extends MigrationAssistant { // apply all transformation from current to latest version. for (Version v : Version.listToLatest(version)) { migrationLogger.info("<" + node.get("name").asText() + "> Start Transform to Version: " + v.label()); - logger.info(migrationLogger.last()); + logger.debug(migrationLogger.last()); transformedNode = transform(transformedNode, v); } // will always be Version.latest() transformedNode = AbstractJsonTransformation.addNewMembersWithDefaultValues(transformedNode); if (legacyDir != null) { migrationLogger.info("Scenario Migrated - OK. Move copy of old version to legacllyDir"); - logger.info(migrationLogger.last()); + logger.debug(migrationLogger.last()); moveFileAddExtension(scenarioFilePath, legacyDir, migrationOptions.getLegacyExtension(), false); } IOUtils.writeTextFile(scenarioFilePath.toString(), StateJsonConverter.serializeJsonNode(transformedNode)); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV7ToV8.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV7ToV8.java index 5bba34009a560d8c3ac6aa6992330c88debe363c..ea7819723f56ed57fd2258384141012807de9965 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV7ToV8.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformV7ToV8.java @@ -161,7 +161,7 @@ public class JsonTransformV7ToV8 extends SimpleJsonTransformation { public static void main(String[] arg) throws Exception { BufferedReader r = new BufferedReader( - new FileReader("/home/lphex/hm.d/vadere/VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario")); + new FileReader("/home/lphex/hm.d/vadere/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario")); String jsonStr = r.lines().collect(Collectors.joining("\n")); ObjectMapper mapper = StateJsonConverter.getMapper(); JsonNode jsonNode = StateJsonConverter.deserializeToNode(jsonStr); diff --git a/VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java b/VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java index b05d53c70d5ab09c2bb1ef81c8404f2932127ad8..47d2f67a44f519560c8a25fb228b5f2f40f98878 100644 --- a/VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java +++ b/VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java @@ -1,5 +1,6 @@ package org.vadere.simulator.models.potential.solver; +import org.jetbrains.annotations.NotNull; import org.junit.Ignore; import org.junit.Test; import org.vadere.meshing.examples.MeshExamples; @@ -8,19 +9,31 @@ import org.vadere.meshing.mesh.gen.PFace; import org.vadere.meshing.mesh.gen.PHalfEdge; import org.vadere.meshing.mesh.gen.PMesh; import org.vadere.meshing.mesh.gen.PVertex; +import org.vadere.meshing.mesh.impl.PMeshPanel; +import org.vadere.meshing.mesh.impl.PSLG; import org.vadere.meshing.mesh.inter.IIncrementalTriangulation; +import org.vadere.meshing.mesh.triangulation.IEdgeLengthFunction; +import org.vadere.meshing.mesh.triangulation.improver.eikmesh.gen.GenEikMesh; +import org.vadere.meshing.mesh.triangulation.improver.eikmesh.impl.PEikMesh; +import org.vadere.meshing.utils.io.poly.MeshPSLGWriter; import org.vadere.meshing.utils.io.poly.MeshPolyReader; import org.vadere.meshing.utils.io.poly.MeshPolyWriter; +import org.vadere.meshing.utils.io.poly.PSLGGenerator; import org.vadere.simulator.models.potential.solver.calculators.EikonalSolver; import org.vadere.simulator.models.potential.solver.calculators.mesh.EikonalSolverFMMTriangulation; import org.vadere.simulator.models.potential.solver.timecost.UnitTimeCostFunction; +import org.vadere.util.geometry.GeometryUtils; import org.vadere.util.geometry.shapes.VPoint; import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.logging.Logger; +import org.vadere.util.math.IDistanceFunction; import java.io.IOException; import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; +import java.util.stream.Collectors; public class TestFMMEikMesh { private static Logger log = Logger.getLogger(TestFMMEikMesh.class); @@ -57,4 +70,62 @@ public class TestFMMEikMesh { System.out.println(mesh.toPythonTriangulation(v -> triangulation.getMesh().getDoubleData(v, "potential"))); } + + @Ignore + @Test + public void testFilledChickenFMM() throws IOException { + testTriangulationFMM("/poly/filled_chicken.poly", new VPoint(2,2), 3.0); + } + + @Ignore + @Test + public void testBridge() throws IOException { + testTriangulationFMM("/poly/bridge.poly", new VPoint(42.0, 46.0), 2.0); + } + + private void testTriangulationFMM(@NotNull final String file, @NotNull final VPoint targetPoint, final double h0) throws IOException { + // 1. read the base PSLG-file + final InputStream inputStream = MeshExamples.class.getResourceAsStream(file); + PSLG pslg = PSLGGenerator.toPSLGtoVShapes(inputStream); + + // 2. generate the unstructured mesh using EikMesh + Collection fixPoints = new ArrayList<>(); + fixPoints.add(targetPoint); + + var eikMesh = new GenEikMesh<>( + IDistanceFunction.create(pslg.getSegmentBound(), pslg.getHoles()), + p -> h0, + fixPoints, + h0, + pslg.getBoundingBox(), + pslg.getAllPolygons(), + () -> new PMesh()); + + PMeshPanel panel = new PMeshPanel(eikMesh.getMesh(), 600, 800); + panel.display(); + + // long for: eikMesh.generate(); + while (!eikMesh.isFinished()) { + eikMesh.improve(); + panel.repaint(); + } + //eikMesh.generate(); + + // 3. solve the eikonal equation on the given mehsh + EikonalSolver solver = new EikonalSolverFMMTriangulation( + new UnitTimeCostFunction(), + eikMesh.getTriangulation(), + eikMesh.getFixVertices().stream().filter(v -> v.distance(targetPoint) < GeometryUtils.DOUBLE_EPS).collect(Collectors.toList())); + long ms = System.currentTimeMillis(); + log.info("start FFM"); + solver.initialize(); + log.info("FFM finished"); + log.info("time: " + (System.currentTimeMillis() - ms)); + + // 4. print the result to the console i.e. standard out + MeshPolyWriter meshPolyWriter = new MeshPolyWriter<>(); + System.out.println(meshPolyWriter.to2DPoly(eikMesh.getMesh(), 1, i -> "potential", v -> false)); + + //System.out.println(eikMesh.getMesh().toPythonTriangulation(v -> eikMesh.getMesh().getDoubleData(v, "potential"))); + } } diff --git a/VadereSimulator/tests/org/vadere/simulator/projects/migration/JoltIdentityTransformationTest.java b/VadereSimulator/tests/org/vadere/simulator/projects/migration/JoltIdentityTransformationTest.java index aa5b57e6ccee8b2d35fe39f825a1e528bf2e6d5f..c674af215634cc8aed182eeb66b25110d9409367 100644 --- a/VadereSimulator/tests/org/vadere/simulator/projects/migration/JoltIdentityTransformationTest.java +++ b/VadereSimulator/tests/org/vadere/simulator/projects/migration/JoltIdentityTransformationTest.java @@ -31,7 +31,7 @@ public class JoltIdentityTransformationTest { @Ignore public void testIdenityTransformationV02() throws IOException { List scenarioFiles = getScenarioFiles( - Paths.get("../VadereModelTests").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); + Paths.get("../Scenarios/ModelTests").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); testIdentity(scenarioFiles, "/identity_v0.2.json"); } @@ -40,14 +40,14 @@ public class JoltIdentityTransformationTest { @Ignore public void testIdenityTransformationV01() throws IOException { - List scenarioFiles = getScenarioFiles(Paths.get("../VadereModelTestsV0.1").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); + List scenarioFiles = getScenarioFiles(Paths.get("../Scenarios/ModelTestsV0.1").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); testIdentity(scenarioFiles, "/identity_v0.1.json"); } @Test @Ignore public void testTransformationV01_to_V02() throws IOException { - List scenarioFiles = getScenarioFiles(Paths.get("../VadereModelTestsV0.1").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); + List scenarioFiles = getScenarioFiles(Paths.get("../Scenarios/ModelTestsV0.1").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); Diffy diffy = new Diffy(); for (Path p : scenarioFiles) { Object jsonInput = JsonUtils.filepathToObject(p.toString()); @@ -98,7 +98,7 @@ public class JoltIdentityTransformationTest { @Test @Ignore public void transformv1t0v2() throws IOException { - Path scenario = Paths.get("../VadereModelTestsV0.1/TestOSM/scenarios/basic_1_chicken_osm1.scenario"); + Path scenario = Paths.get("../Scenarios/ModelTestsV0.1/TestOSM/scenarios/basic_1_chicken_osm1.scenario"); List chainrSpecJson = JsonUtils.classpathToList("/transform_v0.1_to_v0.2.json"); Chainr transform_v1_v2 = Chainr.fromSpec(chainrSpecJson); Object inputJson = JsonUtils.filepathToObject(scenario.toString()); @@ -113,7 +113,7 @@ public class JoltIdentityTransformationTest { @Test @Ignore public void attr01() throws IOException { - List scenarioFiles = getScenarioFiles(Paths.get("../VadereModelTestsV0.1").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); + List scenarioFiles = getScenarioFiles(Paths.get("../Scenarios/ModelTestsV0.1").toRealPath(LinkOption.NOFOLLOW_LINKS).toAbsolutePath()); LinkedHashMap out = new LinkedHashMap<>(); for (Path scenarioFile : scenarioFiles) { Object inputJson = JsonUtils.filepathToObject(scenarioFile.toString());