Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
05c5ba9c
Commit
05c5ba9c
authored
Apr 29, 2019
by
Stefan Schuhbaeck
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'group_models' into 'master'
Group models Closes
#217
See merge request
!58
parents
8fa89408
39142c74
Pipeline
#108901
passed with stages
in 122 minutes and 38 seconds
Changes
226
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
226 changed files
with
21591 additions
and
1007 deletions
+21591
-1007
.gitignore
.gitignore
+10
-0
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario
...oordinates_kai_navigation_random_pos_with_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario
...dinates_kai_navigation_random_pos_without_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario
.../2_bridge_coordinates_kai_navigation_with_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario
...bridge_coordinates_kai_navigation_without_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario
...idge_coordinates_kai_unit_random_pos_with_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario
...e_coordinates_kai_unit_random_pos_without_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario
...narios/2_bridge_coordinates_kai_unit_with_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_without_offset.scenario
...ios/2_bridge_coordinates_kai_unit_without_offset.scenario
+25
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_with_offset.scenario
...oordinates_kai_navigation_random_pos_with_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_without_offset.scenario
...dinates_kai_navigation_random_pos_without_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario
...os/bridge_coordinates_kai_navigation_with_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario
...bridge_coordinates_kai_navigation_without_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_with_offset.scenario
...idge_coordinates_kai_unit_random_pos_with_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_without_offset.scenario
...e_coordinates_kai_unit_random_pos_without_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario
...cenarios/bridge_coordinates_kai_unit_with_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario
...arios/bridge_coordinates_kai_unit_without_offset.scenario
+26
-21
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario
...ison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario
+16
-14
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario
...rison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario
+16
-14
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario
...arison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario
+16
-14
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario
...comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario
+16
-14
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario
...mparison_test.d/scenarios/complex_NAVIGATION_001.scenario
+16
-14
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario
...n_test.d/scenarios/complex_NAVIGATION_groups_001.scenario
+16
-14
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario
...parison_test.d/scenarios/complex_UNIT_groups_001.scenario
+16
-14
Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py
...Integration/run_vadere_console_with_all_scenario_files.py
+4
-4
Tools/Notebooks/GroupModel.ipynb
Tools/Notebooks/GroupModel.ipynb
+404
-0
Tools/SUQController/tutorial/groupRun.py
Tools/SUQController/tutorial/groupRun.py
+84
-0
Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb
...ools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb
+837
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/scenario_output.py
.../VadereAnalysisTool/vadereanalysistool/scenario_output.py
+72
-30
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/scenario_output_test.py
...ysisTool/vadereanalysistool/tests/scenario_output_test.py
+67
-60
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-42-54.117/bridge_coordinates_kai.scenario
...b_2018-11-16_13-42-54.117/bridge_coordinates_kai.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-42-54.117/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-42-54.117/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-42-54.117/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-42-54.117/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-42-54.117/postvis.trajectories
...cre/output/b_2018-11-16_13-42-54.117/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-43-08.160/bridge_coordinates_kai_navigation.scenario
...6_13-43-08.160/bridge_coordinates_kai_navigation.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-43-08.160/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-43-08.160/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-43-08.160/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-43-08.160/overlaps.csv
+10
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-43-08.160/postvis.trajectories
...cre/output/b_2018-11-16_13-43-08.160/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-46-13.488/bridge_coordinates_kai_navigation_random_pos.scenario
...488/bridge_coordinates_kai_navigation_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-46-13.488/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-46-13.488/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-46-13.488/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-46-13.488/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-46-13.488/postvis.trajectories
...cre/output/b_2018-11-16_13-46-13.488/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-31.248/bridge_coordinates_kai_origin_0.scenario
...-16_13-49-31.248/bridge_coordinates_kai_origin_0.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-31.248/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-49-31.248/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-31.248/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-49-31.248/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-31.248/postvis.trajectories
...cre/output/b_2018-11-16_13-49-31.248/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-48.269/bridge_coordinates_kai_origin_0_navigation.scenario
...8.269/bridge_coordinates_kai_origin_0_navigation.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-48.269/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-49-48.269/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-48.269/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-49-48.269/overlaps.csv
+10
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-49-48.269/postvis.trajectories
...cre/output/b_2018-11-16_13-49-48.269/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-53-04.555/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario
...e_coordinates_kai_origin_0_navigation_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-53-04.555/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-53-04.555/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-53-04.555/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-53-04.555/overlaps.csv
+1
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-53-04.555/postvis.trajectories
...cre/output/b_2018-11-16_13-53-04.555/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-18.210/bridge_coordinates_kai_origin_0_random_pos.scenario
...8.210/bridge_coordinates_kai_origin_0_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-18.210/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-56-18.210/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-18.210/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-56-18.210/overlaps.csv
+3
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-18.210/postvis.trajectories
...cre/output/b_2018-11-16_13-56-18.210/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-34.297/bridge_coordinates_kai_random_pos.scenario
...6_13-56-34.297/bridge_coordinates_kai_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-34.297/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-56-34.297/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-34.297/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-56-34.297/overlaps.csv
+3
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-56-34.297/postvis.trajectories
...cre/output/b_2018-11-16_13-56-34.297/postvis.trajectories
+21
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.894/bridge_coordinates_kai.scenario
...b_2018-11-16_13-57-42.894/bridge_coordinates_kai.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.894/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-57-42.894/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.894/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-57-42.894/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.894/postvis.trajectories
...cre/output/b_2018-11-16_13-57-42.894/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.err/bridge_coordinates_kai.scenario
...b_2018-11-16_13-57-42.err/bridge_coordinates_kai.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.err/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-57-42.err/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.err/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-57-42.err/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-42.err/postvis.trajectories
...cre/output/b_2018-11-16_13-57-42.err/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-58.997/bridge_coordinates_kai_navigation.scenario
...6_13-57-58.997/bridge_coordinates_kai_navigation.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-58.997/overlapCount.txt
.../s2ucre/output/b_2018-11-16_13-57-58.997/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-58.997/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_13-57-58.997/overlaps.csv
+10
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_13-57-58.997/postvis.trajectories
...cre/output/b_2018-11-16_13-57-58.997/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-01-07.289/bridge_coordinates_kai_navigation_random_pos.scenario
...289/bridge_coordinates_kai_navigation_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-01-07.289/overlapCount.txt
.../s2ucre/output/b_2018-11-16_14-01-07.289/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-01-07.289/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_14-01-07.289/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-01-07.289/postvis.trajectories
...cre/output/b_2018-11-16_14-01-07.289/postvis.trajectories
+21
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-19.882/bridge_coordinates_kai_origin_0.scenario
...-16_14-04-19.882/bridge_coordinates_kai_origin_0.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-19.882/overlapCount.txt
.../s2ucre/output/b_2018-11-16_14-04-19.882/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-19.882/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_14-04-19.882/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-19.882/postvis.trajectories
...cre/output/b_2018-11-16_14-04-19.882/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-35.721/bridge_coordinates_kai_origin_0_navigation.scenario
...5.721/bridge_coordinates_kai_origin_0_navigation.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-35.721/overlapCount.txt
.../s2ucre/output/b_2018-11-16_14-04-35.721/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-35.721/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_14-04-35.721/overlaps.csv
+10
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-04-35.721/postvis.trajectories
...cre/output/b_2018-11-16_14-04-35.721/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-08-14.82/bridge_coordinates_kai_origin_0_navigation_random_pos.scenario
...e_coordinates_kai_origin_0_navigation_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-08-14.82/overlapCount.txt
...a/s2ucre/output/b_2018-11-16_14-08-14.82/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-08-14.82/overlaps.csv
...tData/s2ucre/output/b_2018-11-16_14-08-14.82/overlaps.csv
+1
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-08-14.82/postvis.trajectories
...ucre/output/b_2018-11-16_14-08-14.82/postvis.trajectories
+21
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-36.817/bridge_coordinates_kai_origin_0_random_pos.scenario
...6.817/bridge_coordinates_kai_origin_0_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-36.817/overlapCount.txt
.../s2ucre/output/b_2018-11-16_14-11-36.817/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-36.817/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_14-11-36.817/overlaps.csv
+3
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-36.817/postvis.trajectories
...cre/output/b_2018-11-16_14-11-36.817/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-53.469/bridge_coordinates_kai_random_pos.scenario
...6_14-11-53.469/bridge_coordinates_kai_random_pos.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-53.469/overlapCount.txt
.../s2ucre/output/b_2018-11-16_14-11-53.469/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-53.469/overlaps.csv
...Data/s2ucre/output/b_2018-11-16_14-11-53.469/overlaps.csv
+3
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/b_2018-11-16_14-11-53.469/postvis.trajectories
...cre/output/b_2018-11-16_14-11-53.469/postvis.trajectories
+22
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/bridge_coordinates_kai_2018-10-24_13-45-18.956/bridge_coordinates_kai.scenario
...i_2018-10-24_13-45-18.956/bridge_coordinates_kai.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/bridge_coordinates_kai_2018-10-26_16-12-24.505/bridge_coordinates_kai.scenario
...i_2018-10-26_16-12-24.505/bridge_coordinates_kai.scenario
+279
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/bridge_coordinates_kai_2018-10-26_16-22-18.280/overlapCount.txt
..._coordinates_kai_2018-10-26_16-22-18.280/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/bridge_coordinates_kai_2018-10-26_16-22-18.280/overlaps.csv
...idge_coordinates_kai_2018-10-26_16-22-18.280/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/empty_2018-10-12_12-53-10.262/empty.scenario
...tput/corrupt/empty_2018-10-12_12-53-10.262/empty.scenario
+181
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/invalid/overlapCount.txt
...s/testData/s2ucre/output/corrupt/invalid/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/invalid/overlaps.csv
...tests/testData/s2ucre/output/corrupt/invalid/overlaps.csv
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/corrupt/invalid/postvis.trajectories
...stData/s2ucre/output/corrupt/invalid/postvis.trajectories
+21
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_13-56-50.397/empty.scenario
...2ucre/output/empty_2018-11-16_13-56-50.397/empty.scenario
+181
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_13-56-50.397/overlapCount.txt
...cre/output/empty_2018-11-16_13-56-50.397/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_13-56-50.397/overlaps.csv
.../s2ucre/output/empty_2018-11-16_13-56-50.397/overlaps.csv
+1
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_13-56-50.397/postvis.trajectories
...output/empty_2018-11-16_13-56-50.397/postvis.trajectories
+21
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_14-12-09.609/empty.scenario
...2ucre/output/empty_2018-11-16_14-12-09.609/empty.scenario
+181
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_14-12-09.609/overlapCount.txt
...cre/output/empty_2018-11-16_14-12-09.609/overlapCount.txt
+2
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_14-12-09.609/overlaps.csv
.../s2ucre/output/empty_2018-11-16_14-12-09.609/overlaps.csv
+1
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/testData/s2ucre/output/empty_2018-11-16_14-12-09.609/postvis.trajectories
...output/empty_2018-11-16_14-12-09.609/postvis.trajectories
+21
-0
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/tests/vadere_project_test.py
...lysisTool/vadereanalysistool/tests/vadere_project_test.py
+1
-1
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool/vadere_project.py
...s/VadereAnalysisTool/vadereanalysistool/vadere_project.py
+8
-12
VadereGui/pom.xml
VadereGui/pom.xml
+20
-0
VadereGui/src/org/vadere/gui/postvisualization/PostVisualizationConsole.java
...adere/gui/postvisualization/PostVisualizationConsole.java
+36
-1
VadereModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario
...OSMGroup_calibration/scenarios/groupBaseScenario.scenario
+388
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_2group.scenario
+244
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_2group_sparse.scenario
+243
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_3group.scenario
+244
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_3group_sparse.scenario
+243
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_4group.scenario
+244
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_4group_sparse.scenario
+243
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_5group.scenario
+244
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_5group_sparse.scenario
+243
-0
VadereModelCalibration/TestOSMGroup_calibration/vadere.project
...eModelCalibration/TestOSMGroup_calibration/vadere.project
+1
-0
VadereModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario
.../TestOSM_calibration/scenarios/groupBaseScenario.scenario
+118
-49
VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
+67
-1
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
...SMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
+238
-0
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario
...enarios/VadereSimulation-GroupBehavior_no_groups.scenario
+233
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
...s/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
+10
-10
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
.../TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
+5
-5
VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
.../TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
+5
-5
VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
...arios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
+5
-5
VadereModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
...cenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
+289
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario
...s/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario
+322
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario
...s/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario
+322
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
+1307
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
+1307
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
+1307
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
+1307
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
...MGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
+280
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
+280
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
...MGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
+280
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
+280
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
+280
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
+190
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
+178
-0
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
+178
-0
VadereModelTests/TestOSMGroup/vadere.project
VadereModelTests/TestOSMGroup/vadere.project
+1
-1
VadereSimulator/src/org/vadere/simulator/control/GroupSourceController.java
...c/org/vadere/simulator/control/GroupSourceController.java
+11
-7
VadereSimulator/src/org/vadere/simulator/control/SourceController.java
...or/src/org/vadere/simulator/control/SourceController.java
+3
-2
VadereSimulator/src/org/vadere/simulator/control/TopographyController.java
...rc/org/vadere/simulator/control/TopographyController.java
+2
-0
VadereSimulator/src/org/vadere/simulator/control/factory/GroupSourceControllerFactory.java
...mulator/control/factory/GroupSourceControllerFactory.java
+4
-2
VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/VadereConsole.java
...c/org/vadere/simulator/entrypoints/cmd/VadereConsole.java
+1
-6
VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/commands/ProjectRunSubCommand.java
...ulator/entrypoints/cmd/commands/ProjectRunSubCommand.java
+47
-17
VadereSimulator/src/org/vadere/simulator/models/DynamicElementFactory.java
...rc/org/vadere/simulator/models/DynamicElementFactory.java
+7
-0
VadereSimulator/src/org/vadere/simulator/models/MainModel.java
...eSimulator/src/org/vadere/simulator/models/MainModel.java
+17
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/BehaviouralHeuristicsModel.java
...dere/simulator/models/bhm/BehaviouralHeuristicsModel.java
+1
-4
VadereSimulator/src/org/vadere/simulator/models/bmm/BiomechanicsModel.java
...rc/org/vadere/simulator/models/bmm/BiomechanicsModel.java
+1
-5
VadereSimulator/src/org/vadere/simulator/models/gnm/GradientNavigationModel.java
.../vadere/simulator/models/gnm/GradientNavigationModel.java
+2
-5
VadereSimulator/src/org/vadere/simulator/models/groups/AbstractGroupModel.java
...rg/vadere/simulator/models/groups/AbstractGroupModel.java
+21
-0
VadereSimulator/src/org/vadere/simulator/models/groups/CentroidGroupFactory.java
.../vadere/simulator/models/groups/CentroidGroupFactory.java
+0
-68
VadereSimulator/src/org/vadere/simulator/models/groups/CentroidGroupModel.java
...rg/vadere/simulator/models/groups/CentroidGroupModel.java
+0
-137
VadereSimulator/src/org/vadere/simulator/models/groups/Group.java
...mulator/src/org/vadere/simulator/models/groups/Group.java
+21
-9
VadereSimulator/src/org/vadere/simulator/models/groups/GroupFactory.java
.../src/org/vadere/simulator/models/groups/GroupFactory.java
+0
-2
VadereSimulator/src/org/vadere/simulator/models/groups/GroupModel.java
...or/src/org/vadere/simulator/models/groups/GroupModel.java
+55
-14
VadereSimulator/src/org/vadere/simulator/models/groups/cgm/CentroidGroup.java
...org/vadere/simulator/models/groups/cgm/CentroidGroup.java
+375
-0
VadereSimulator/src/org/vadere/simulator/models/groups/cgm/CentroidGroupModel.java
...adere/simulator/models/groups/cgm/CentroidGroupModel.java
+232
-0
VadereSimulator/src/org/vadere/simulator/models/groups/cgm/CentroidGroupPotential.java
...e/simulator/models/groups/cgm/CentroidGroupPotential.java
+4
-4
VadereSimulator/src/org/vadere/simulator/models/groups/cgm/CentroidGroupSpeedAdjuster.java
...mulator/models/groups/cgm/CentroidGroupSpeedAdjuster.java
+4
-2
VadereSimulator/src/org/vadere/simulator/models/groups/cgm/CentroidGroupStepSizeAdjuster.java
...ator/models/groups/cgm/CentroidGroupStepSizeAdjuster.java
+5
-1
VadereSimulator/src/org/vadere/simulator/models/osm/OptimalStepsModel.java
...rc/org/vadere/simulator/models/osm/OptimalStepsModel.java
+8
-18
VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeOSM.java
...re/simulator/models/osm/updateScheme/UpdateSchemeOSM.java
+3
-3
VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeSequential.java
...lator/models/osm/updateScheme/UpdateSchemeSequential.java
+2
-0
VadereSimulator/src/org/vadere/simulator/models/ovm/OptimalVelocityModel.java
...org/vadere/simulator/models/ovm/OptimalVelocityModel.java
+1
-4
VadereSimulator/src/org/vadere/simulator/models/reynolds/ReynoldsSteeringModel.java
...dere/simulator/models/reynolds/ReynoldsSteeringModel.java
+1
-5
VadereSimulator/src/org/vadere/simulator/models/sfm/SocialForceModel.java
...src/org/vadere/simulator/models/sfm/SocialForceModel.java
+1
-3
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/datakey/TimestepGroupPairKey.java
...projects/dataprocessing/datakey/TimestepGroupPairKey.java
+81
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/outputfile/GroupPairOutputFile.java
...ojects/dataprocessing/outputfile/GroupPairOutputFile.java
+17
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/procesordata/MaxCentroidGroupDistData.java
...dataprocessing/procesordata/MaxCentroidGroupDistData.java
+51
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/DataProcessor.java
...ator/projects/dataprocessing/processor/DataProcessor.java
+15
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/GroupMemberEuclideanDist.java
...ts/dataprocessing/processor/GroupMemberEuclideanDist.java
+33
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/GroupMemberPotentialDist.java
...ts/dataprocessing/processor/GroupMemberPotentialDist.java
+33
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/GroupMemberSeparatedByObstacle.java
...aprocessing/processor/GroupMemberSeparatedByObstacle.java
+33
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianGroupIDProcessor.java
.../dataprocessing/processor/PedestrianGroupIDProcessor.java
+13
-15
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianGroupMaxDistProcessor.java
...processing/processor/PedestrianGroupMaxDistProcessor.java
+46
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianGroupSizeProcessor.java
...ataprocessing/processor/PedestrianGroupSizeProcessor.java
+13
-15
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/TargetFloorFieldGridProcessor.java
...taprocessing/processor/TargetFloorFieldGridProcessor.java
+1
-1
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/util/ModelFilter.java
...r/projects/dataprocessing/processor/util/ModelFilter.java
+28
-0
VadereSimulator/src/org/vadere/simulator/projects/io/IOOutput.java
...ulator/src/org/vadere/simulator/projects/io/IOOutput.java
+16
-5
VadereSimulator/src/org/vadere/simulator/projects/io/TrajectoryReader.java
...rc/org/vadere/simulator/projects/io/TrajectoryReader.java
+11
-4
VadereSimulator/testResources/migration/v03_to_v04/group_OSM_1Source1Place.scenario
...ces/migration/v03_to_v04/group_OSM_1Source1Place.scenario
+1
-1
VadereSimulator/tests/org/vadere/simulator/control/GroupSourceControllerTest.java
...g/vadere/simulator/control/GroupSourceControllerTest.java
+79
-9
VadereSimulator/tests/org/vadere/simulator/control/TestSourceControllerUsingConstantSpawnRate.java
...r/control/TestSourceControllerUsingConstantSpawnRate.java
+14
-2
VadereSimulator/tests/org/vadere/simulator/models/groups/cgm/CentroidGroupModelTest.java
...e/simulator/models/groups/cgm/CentroidGroupModelTest.java
+76
-0
VadereSimulator/tests/org/vadere/simulator/models/groups/cgm/CentroidGroupTest.java
...vadere/simulator/models/groups/cgm/CentroidGroupTest.java
+173
-0
VadereSimulator/tests/org/vadere/simulator/models/groups/cgm/PedestrianIdMatcher.java
...dere/simulator/models/groups/cgm/PedestrianIdMatcher.java
+51
-0
VadereSimulator/tests/org/vadere/simulator/projects/ProjectOutputTest.java
...ests/org/vadere/simulator/projects/ProjectOutputTest.java
+28
-7
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/datakey/TimestepGroupPairKeyTest.java
...ects/dataprocessing/datakey/TimestepGroupPairKeyTest.java
+99
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessorTestEnv.java
...cessing/processor/AreaDensityVoronoiProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaSpeedProcessorTestEnv.java
...s/dataprocessing/processor/AreaSpeedProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/EvacuationTimeProcessorTestEnv.java
...aprocessing/processor/EvacuationTimeProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/MaxOverlapProcessorTestEnv.java
.../dataprocessing/processor/MaxOverlapProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/MeanPedestrianEvacuationTimeProcessorTestEnv.java
...ocessor/MeanPedestrianEvacuationTimeProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/NumberOverlapsProcessorTestEnv.java
...aprocessing/processor/NumberOverlapsProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianDensityCountingProcessorTestEnv.java
.../processor/PedestrianDensityCountingProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianEvacuationTimeProcessorTestEnv.java
...g/processor/PedestrianEvacuationTimeProcessorTestEnv.java
+4
-3
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianFlowProcessorTestEnv.java
...aprocessing/processor/PedestrianFlowProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianLastPositionProcessorTestEnv.java
...ing/processor/PedestrianLastPositionProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianOverlapProcessorTestEnv.java
...ocessing/processor/PedestrianOverlapProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianPositionProcessorTestEnv.java
...cessing/processor/PedestrianPositionProcessorTestEnv.java
+3
-2
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianVelocityProcessorTestEnv.java
...cessing/processor/PedestrianVelocityProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessorTestEnv.java
...sing/processor/PedestrianWaitingTimeProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/TargetFloorFieldGridProcessorTestEnv.java
...ssing/processor/TargetFloorFieldGridProcessorTestEnv.java
+1
-0
VadereSimulator/tests/org/vadere/simulator/projects/migration/JsonMigrationAssistantTest.java
...ulator/projects/migration/JsonMigrationAssistantTest.java
+7
-3
VadereSimulator/tests/org/vadere/simulator/utils/CentroidGroupListBuilder.java
.../org/vadere/simulator/utils/CentroidGroupListBuilder.java
+85
-0
VadereSimulator/tests/org/vadere/simulator/utils/PedestrianListBuilder.java
...sts/org/vadere/simulator/utils/PedestrianListBuilder.java
+3
-3
VadereSimulator/tests/org/vadere/simulator/utils/reflection/TestResourceHandler.java
...adere/simulator/utils/reflection/TestResourceHandler.java
+8
-0
VadereState/src/org/vadere/state/scenario/Agent.java
VadereState/src/org/vadere/state/scenario/Agent.java
+7
-0
VadereState/src/org/vadere/state/scenario/DynamicElementContainer.java
...rc/org/vadere/state/scenario/DynamicElementContainer.java
+4
-0
VadereState/src/org/vadere/state/scenario/PedestrianPair.java
...reState/src/org/vadere/state/scenario/PedestrianPair.java
+85
-0
VadereState/src/org/vadere/state/scenario/Topography.java
VadereState/src/org/vadere/state/scenario/Topography.java
+42
-1
pom.xml
pom.xml
+6
-0
No files found.
.gitignore
View file @
05c5ba9c
...
...
@@ -34,6 +34,16 @@ __pycache__/
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool.egg-info/
Tools/VadereAnalysisTools/VadereAnalysisTool/build/
Tools/VadereAnalysisTools/VadereAnalysisTool/dist/
# Jupyter Notebooks
**/.ipynb_checkpoints
#model test output
VadereModelTests/**/output
VadereModelTests/*_private
VadereModelCalibration/**/output
VadereModelTests/**/legacy
VadereUtils/output/**
VadereModelTests/*_private
# Operating system files
.DS_Store
...
...
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario
View file @
05c5ba9c
{
"name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "",
"release" : "0.
6
",
"release" : "0.
8
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -39,6 +39,23 @@
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
...
...
@@ -56,7 +73,9 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
"submodels" : [ ],
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -67,23 +86,6 @@
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
}
},
"attributesSimulation" : {
...
...
@@ -98,6 +100,7 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -248,7 +251,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -273,7 +275,9 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ],
"teleporter" : null
}
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario
View file @
05c5ba9c
{
"name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "",
"release" : "0.
6
",
"release" : "0.
8
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -39,6 +39,23 @@
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
...
...
@@ -56,7 +73,9 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
"submodels" : [ ],
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -67,23 +86,6 @@
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
}
},
"attributesSimulation" : {
...
...
@@ -98,6 +100,7 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -248,7 +251,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -273,7 +275,9 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ],
"teleporter" : null
}
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario
View file @
05c5ba9c
{
"name" : "2_bridge_coordinates_kai_navigation_with_offset",
"description" : "",
"release" : "0.
6
",
"release" : "0.
8
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -39,6 +39,23 @@
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
...
...
@@ -56,7 +73,9 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
"submodels" : [ ],
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -67,23 +86,6 @@
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
}
},
"attributesSimulation" : {
...
...
@@ -98,6 +100,7 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -248,7 +251,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -273,7 +275,9 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ],
"teleporter" : null
}
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario
View file @
05c5ba9c
{
"name" : "2_bridge_coordinates_kai_navigation_without_offset",
"description" : "",
"release" : "0.
6
",
"release" : "0.
8
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -39,6 +39,23 @@
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
...
...
@@ -56,7 +73,9 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
"submodels" : [ ],
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -67,23 +86,6 @@
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
}
},
"attributesSimulation" : {
...
...
@@ -98,6 +100,7 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -248,7 +251,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -273,7 +275,9 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ],
"teleporter" : null
}
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario
View file @
05c5ba9c
{
"name" : "2_bridge_coordinates_kai_unit_random_pos_with_offset",
"description" : "",
"release" : "0.
6
",
"release" : "0.
8
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -39,6 +39,23 @@
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
...
...
@@ -56,7 +73,9 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
"submodels" : [ ],
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -67,23 +86,6 @@
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
}
},
"attributesSimulation" : {
...
...
@@ -98,6 +100,7 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -248,7 +251,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -273,7 +275,9 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ],
"teleporter" : null
}
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario
View file @
05c5ba9c
{
"name" : "2_bridge_coordinates_kai_unit_random_pos_without_offset",
"description" : "",
"release" : "0.
6
",
"release" : "0.
8
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -39,6 +39,23 @@
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,