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
3b2e7a92
Commit
3b2e7a92
authored
May 20, 2019
by
Benedikt Kleinmeier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into salient_behavior
# Conflicts: # VadereState/src/org/vadere/state/simulation/VTrajectory.java
parents
70c73914
ad2d8105
Changes
143
Hide whitespace changes
Inline
Side-by-side
Showing
143 changed files
with
3665 additions
and
2451 deletions
+3665
-2451
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
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
+3
-3
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
+3
-3
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario
.../2_bridge_coordinates_kai_navigation_with_offset.scenario
+3
-3
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario
...bridge_coordinates_kai_navigation_without_offset.scenario
+3
-3
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
+3
-3
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
+3
-3
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
+3
-3
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
+3
-3
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
+3
-3
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
+3
-3
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario
...os/bridge_coordinates_kai_navigation_with_offset.scenario
+3
-3
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario
...bridge_coordinates_kai_navigation_without_offset.scenario
+3
-3
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
+3
-3
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
+3
-3
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario
...cenarios/bridge_coordinates_kai_unit_with_offset.scenario
+3
-3
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario
...arios/bridge_coordinates_kai_unit_without_offset.scenario
+3
-3
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario
...ison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario
+2
-2
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario
...rison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario
+2
-2
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario
...arison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario
+1
-1
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario
...comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario
+1
-1
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario
...mparison_test.d/scenarios/complex_NAVIGATION_001.scenario
+2
-2
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario
...n_test.d/scenarios/complex_NAVIGATION_groups_001.scenario
+1
-1
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario
...parison_test.d/scenarios/complex_UNIT_groups_001.scenario
+2
-2
Tools/Notebooks/TrajectoryMetric.ipynb
Tools/Notebooks/TrajectoryMetric.ipynb
+406
-0
Tools/VadereAnalysisTools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb
...ools/Plots/fundamentalDiagrams/OSM_calibrationGroup.ipynb
+10
-394
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
...n/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
...stOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
+29
-44
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
+35
-23
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
+35
-23
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
+35
-23
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
+35
-23
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
+42
-23
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
+35
-23
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
+35
-23
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
...enarios/floor_field_navigation_test_displaced_ok.scenario
+194
-0
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario
...TestBHM/scenarios/floor_field_navigation_test_ok.scenario
+203
-0
VadereModelTests/TestBHM/vadere.project
VadereModelTests/TestBHM/vadere.project
+1
-0
VadereModelTests/TestRSM/scenarios/Reynolds_test.scenario
VadereModelTests/TestRSM/scenarios/Reynolds_test.scenario
+7
-0
VadereModelTests/TestRSM/vadere.project
VadereModelTests/TestRSM/vadere.project
+1
-1
VadereSimulator/src/org/vadere/simulator/control/Simulation.java
...imulator/src/org/vadere/simulator/control/Simulation.java
+6
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/BehaviouralHeuristicsModel.java
...dere/simulator/models/bhm/BehaviouralHeuristicsModel.java
+22
-1
VadereSimulator/src/org/vadere/simulator/models/bhm/DirectionAddend.java
.../src/org/vadere/simulator/models/bhm/DirectionAddend.java
+2
-1
VadereSimulator/src/org/vadere/simulator/models/bhm/DirectionAddendObstacle.java
.../vadere/simulator/models/bhm/DirectionAddendObstacle.java
+2
-1
VadereSimulator/src/org/vadere/simulator/models/bhm/DirectionAddendObstacleTargetPotential.java
...or/models/bhm/DirectionAddendObstacleTargetPotential.java
+105
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/NavigationProximity.java
.../org/vadere/simulator/models/bhm/NavigationProximity.java
+80
-4
VadereSimulator/src/org/vadere/simulator/models/bhm/PedestrianBHM.java
...or/src/org/vadere/simulator/models/bhm/PedestrianBHM.java
+134
-25
VadereSimulator/src/org/vadere/simulator/models/bhm/TargetDirection.java
.../src/org/vadere/simulator/models/bhm/TargetDirection.java
+8
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/TargetDirectionClose.java
...org/vadere/simulator/models/bhm/TargetDirectionClose.java
+33
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/TargetDirectionEuclidean.java
...vadere/simulator/models/bhm/TargetDirectionEuclidean.java
+24
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/TargetDirectionGeoGradient.java
...dere/simulator/models/bhm/TargetDirectionGeoGradient.java
+44
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/TargetDirectionGeoOptimum.java
...adere/simulator/models/bhm/TargetDirectionGeoOptimum.java
+77
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/TargetDirectionGeoOptimumBruteForce.java
...lator/models/bhm/TargetDirectionGeoOptimumBruteForce.java
+61
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/UtilsBHM.java
...mulator/src/org/vadere/simulator/models/bhm/UtilsBHM.java
+28
-29
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTarget.java
...mulator/models/potential/fields/PotentialFieldTarget.java
+9
-1
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTargetGrid.java
...tor/models/potential/fields/PotentialFieldTargetGrid.java
+11
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/timecost/ITimeCostFunction.java
...r/models/potential/solver/timecost/ITimeCostFunction.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostFunctionFactory.java
...s/potential/timeCostFunction/TimeCostFunctionFactory.java
+7
-0
VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostFunctionObstacleDistance.java
...al/timeCostFunction/TimeCostFunctionObstacleDistance.java
+51
-0
VadereSimulator/src/org/vadere/simulator/models/queuing/PotentialFieldTargetQueuingGrid.java
...lator/models/queuing/PotentialFieldTargetQueuingGrid.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/reynolds/PedestrianReynolds.java
.../vadere/simulator/models/reynolds/PedestrianReynolds.java
+1
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/ProcessorManager.java
...e/simulator/projects/dataprocessing/ProcessorManager.java
+13
-2
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/datakey/BonnMotionKey.java
...ulator/projects/dataprocessing/datakey/BonnMotionKey.java
+51
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/outputfile/BonnMotionTrajectoryFile.java
...s/dataprocessing/outputfile/BonnMotionTrajectoryFile.java
+33
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/outputfile/OutputFile.java
...ulator/projects/dataprocessing/outputfile/OutputFile.java
+15
-4
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDataProcessor.java
.../projects/dataprocessing/processor/AreaDataProcessor.java
+1
-7
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityCountingProcessor.java
...ataprocessing/processor/AreaDensityCountingProcessor.java
+57
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiAlgorithm.java
...dataprocessing/processor/AreaDensityVoronoiAlgorithm.java
+13
-13
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessor.java
...dataprocessing/processor/AreaDensityVoronoiProcessor.java
+4
-7
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaSpeedProcessor.java
...projects/dataprocessing/processor/AreaSpeedProcessor.java
+2
-1
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/BonnMotionTrajectoryProcessor.java
...taprocessing/processor/BonnMotionTrajectoryProcessor.java
+137
-0
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramBProcessor.java
...ataprocessing/processor/FundamentalDiagramBProcessor.java
+6
-7
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramCProcessor.java
...ataprocessing/processor/FundamentalDiagramCProcessor.java
+2
-5
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramDProcessor.java
...ataprocessing/processor/FundamentalDiagramDProcessor.java
+2
-6
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramEProcessor.java
...ataprocessing/processor/FundamentalDiagramEProcessor.java
+2
-6
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianCrossingTimeProcessor.java
...processing/processor/PedestrianCrossingTimeProcessor.java
+1
-5
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianDensityCountingProcessor.java
...cessing/processor/PedestrianDensityCountingProcessor.java
+3
-2
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessor.java
...ocessing/processor/PedestrianWaitingEndTimeProcessor.java
+1
-5
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessor.java
...aprocessing/processor/PedestrianWaitingTimeProcessor.java
+1
-5
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessorTestEnv.java
...cessing/processor/AreaDensityVoronoiProcessorTestEnv.java
+9
-18
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaSpeedProcessorTestEnv.java
...s/dataprocessing/processor/AreaSpeedProcessorTestEnv.java
+10
-32
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/BonnMotionTrajectoryProcessorTest.java
...ocessing/processor/BonnMotionTrajectoryProcessorTest.java
+24
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/BonnMotionTrajectoryProcessorTestEnv.java
...ssing/processor/BonnMotionTrajectoryProcessorTestEnv.java
+81
-0
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/EvacuationTimeProcessorTestEnv.java
...aprocessing/processor/EvacuationTimeProcessorTestEnv.java
+6
-35
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/MaxOverlapProcessorTestEnv.java
.../dataprocessing/processor/MaxOverlapProcessorTestEnv.java
+11
-37
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/MeanPedestrianEvacuationTimeProcessorTestEnv.java
...ocessor/MeanPedestrianEvacuationTimeProcessorTestEnv.java
+5
-32
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/NumberOverlapsProcessorTestEnv.java
...aprocessing/processor/NumberOverlapsProcessorTestEnv.java
+5
-32
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianDensityCountingProcessorTestEnv.java
.../processor/PedestrianDensityCountingProcessorTestEnv.java
+5
-27
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianEndTimeProcessorTestEnv.java
...ocessing/processor/PedestrianEndTimeProcessorTestEnv.java
+8
-26
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianEvacuationTimeProcessorTestEnv.java
...g/processor/PedestrianEvacuationTimeProcessorTestEnv.java
+9
-33
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianFlowProcessorTestEnv.java
...aprocessing/processor/PedestrianFlowProcessorTestEnv.java
+12
-32
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianLastPositionProcessorTestEnv.java
...ing/processor/PedestrianLastPositionProcessorTestEnv.java
+5
-28
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianOSMStrideLengthProcessorTestEnv.java
.../processor/PedestrianOSMStrideLengthProcessorTestEnv.java
+1
-18
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianOverlapProcessorTestEnv.java
...ocessing/processor/PedestrianOverlapProcessorTestEnv.java
+18
-34
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianPositionProcessorTestEnv.java
...cessing/processor/PedestrianPositionProcessorTestEnv.java
+1
-19
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianSourceIdProcessorTestEnv.java
...cessing/processor/PedestrianSourceIdProcessorTestEnv.java
+1
-16
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianStartTimeProcessorTestEnv.java
...essing/processor/PedestrianStartTimeProcessorTestEnv.java
+1
-20
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianStateProcessorTestEnv.java
...processing/processor/PedestrianStateProcessorTestEnv.java
+3
-22
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianTargetIdProcessorTestEnv.java
...cessing/processor/PedestrianTargetIdProcessorTestEnv.java
+8
-24
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianVelocityProcessorTestEnv.java
...cessing/processor/PedestrianVelocityProcessorTestEnv.java
+5
-31
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessorTestEnv.java
...g/processor/PedestrianWaitingEndTimeProcessorTestEnv.java
+7
-20
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessorTestEnv.java
...sing/processor/PedestrianWaitingTimeProcessorTestEnv.java
+6
-21
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/ProcessorTest.java
...ator/projects/dataprocessing/processor/ProcessorTest.java
+12
-2
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/ProcessorTestEnv.java
...r/projects/dataprocessing/processor/ProcessorTestEnv.java
+93
-13
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/TargetFloorFieldGridProcessorTestEnv.java
...ssing/processor/TargetFloorFieldGridProcessorTestEnv.java
+4
-17
VadereState/src/org/vadere/state/attributes/models/AttributesFloorField.java
.../vadere/state/attributes/models/AttributesFloorField.java
+6
-0
VadereState/src/org/vadere/state/attributes/models/AttributesTimeCost.java
...rg/vadere/state/attributes/models/AttributesTimeCost.java
+21
-29
VadereState/src/org/vadere/state/attributes/models/TimeCostFunctionType.java
.../vadere/state/attributes/models/TimeCostFunctionType.java
+32
-0
VadereState/src/org/vadere/state/attributes/processor/AttributesAreaDensityCountingProcessor.java
...tes/processor/AttributesAreaDensityCountingProcessor.java
+9
-0
VadereState/src/org/vadere/state/attributes/processor/AttributesAreaProcessor.java
...e/state/attributes/processor/AttributesAreaProcessor.java
+1
-0
VadereState/src/org/vadere/state/attributes/processor/AttributesBonnMotionTrajectoryProcessor.java
...es/processor/AttributesBonnMotionTrajectoryProcessor.java
+43
-0
VadereState/src/org/vadere/state/simulation/VTrajectory.java
VadereState/src/org/vadere/state/simulation/VTrajectory.java
+9
-6
VadereUtils/src/org/vadere/util/geometry/GeometryUtils.java
VadereUtils/src/org/vadere/util/geometry/GeometryUtils.java
+67
-3
VadereUtils/src/org/vadere/util/geometry/shapes/VPoint.java
VadereUtils/src/org/vadere/util/geometry/shapes/VPoint.java
+0
-6
VadereUtils/src/org/vadere/util/geometry/shapes/VPolygon.java
...reUtils/src/org/vadere/util/geometry/shapes/VPolygon.java
+68
-4
VadereUtils/src/org/vadere/util/geometry/shapes/VRectangle.java
...Utils/src/org/vadere/util/geometry/shapes/VRectangle.java
+18
-0
VadereUtils/src/org/vadere/util/geometry/shapes/VRing.java
VadereUtils/src/org/vadere/util/geometry/shapes/VRing.java
+19
-0
VadereUtils/src/org/vadere/util/geometry/shapes/VShape.java
VadereUtils/src/org/vadere/util/geometry/shapes/VShape.java
+3
-0
VadereUtils/src/org/vadere/util/geometry/shapes/VTriangle.java
...eUtils/src/org/vadere/util/geometry/shapes/VTriangle.java
+50
-13
VadereUtils/src/org/vadere/util/math/GoldenSectionSearch.java
...reUtils/src/org/vadere/util/math/GoldenSectionSearch.java
+57
-0
VadereUtils/src/org/vadere/util/math/MathUtil.java
VadereUtils/src/org/vadere/util/math/MathUtil.java
+3
-0
VadereUtils/tests/org/vadere/util/geometry/shapes/TestVTriangle.java
.../tests/org/vadere/util/geometry/shapes/TestVTriangle.java
+52
-77
VadereUtils/tests/org/vadere/util/math/TestMachineEpsilon.java
...eUtils/tests/org/vadere/util/math/TestMachineEpsilon.java
+33
-0
No files found.
.gitlab-ci.yml
View file @
3b2e7a92
...
...
@@ -33,9 +33,9 @@ variables:
# (i.e.,the virtual machines). We have to track that!
stages
:
-
unit_test
-
deploy
-
integration_test
-
seed_test
-
deploy
# PLEASE, OMIT FOLLOWING GITLAB PITFALLS:
#
...
...
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_navigation_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_navigation_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_with_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_unit_random_pos_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_random_pos_without_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_unit_random_pos_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_unit_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_unit_without_offset.scenario
View file @
3b2e7a92
{
"name" : "2_bridge_coordinates_kai_unit_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -5104110572817619091,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_with_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_random_pos_without_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_with_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_navigation_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_navigation_without_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_navigation_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_with_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_unit_random_pos_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_random_pos_without_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_unit_random_pos_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_with_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_unit_with_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/bridge_coordinates_kai_unit_without_offset.scenario
View file @
3b2e7a92
{
"name" : "bridge_coordinates_kai_unit_without_offset",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
@@ -100,7 +100,6 @@
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"eventInfos" : [ ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -278,6 +277,7 @@
},
"dynamicElements" : [ ],
"teleporter" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_NAVIGATION.scenario
View file @
3b2e7a92
{
"name" : "bridge_timeCost_NAVIGATION",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -89,7 +89,7 @@
}
},
"attributesSimulation" : {
"finishTime" :
150
.0,
"finishTime" :
75
.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
...
...
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_OBSTACLES.scenario
View file @
3b2e7a92
{
"name" : "bridge_timeCost_OBSTACLES",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -89,7 +89,7 @@
}
},
"attributesSimulation" : {
"finishTime" :
12
0.0,
"finishTime" :
6
0.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
...
...
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_QUEUEING.scenario
View file @
3b2e7a92
{
"name" : "bridge_timeCost_QUEUEING",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_timeCost_UNIT.scenario
View file @
3b2e7a92
{
"name" : "bridge_timeCost_UNIT",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_001.scenario
View file @
3b2e7a92
{
"name" : "complex_NAVIGATION_001",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -89,7 +89,7 @@
}
},
"attributesSimulation" : {
"finishTime" :
9
0.0,
"finishTime" :
6
0.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
...
...
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_NAVIGATION_groups_001.scenario
View file @
3b2e7a92
{
"name" : "complex_NAVIGATION_groups_001",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/complex_UNIT_groups_001.scenario
View file @
3b2e7a92
{
"name" : "complex_UNIT_groups_001",
"description" : "",
"release" : "0.
8
",
"release" : "0.
9
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -93,7 +93,7 @@
}
},
"attributesSimulation" : {
"finishTime" :
150
.0,
"finishTime" :
75
.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
...
...
Tools/Notebooks/TrajectoryMetric.ipynb
0 → 100644
View file @
3b2e7a92
{
"cells": [
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"code_folding": []
},
"outputs": [],
"source": [
"import json\n",
"import numpy as np\n",
"import pandas as pd\n",
"import math\n",
"import matplotlib.pyplot as plt\n",
"from matplotlib.lines import Line2D\n",
"\n",
"file = \"./data/trajectories_distance.txt\"\n",
"real_file = \"./data/KO/ko-240-120-240/ko-240-120-240_combined_MB.txt\"\n",
"f = open(file, \"r\")\n",
"header = f.readline();\n",
"trajectories = dict({});\n",
"for row in f:\n",
" s = row.split(\" \");\n",
" pedId = int(s[0]);\n",
" footsteps = json.loads(s[1]);\n",
" trajectories[pedId] = footsteps[0]['footSteps'];\n",
" \n",
"def get_trajectory(pedId):\n",
" return trajectories[pedId]\n",
"\n",
"def get_footstep(trajectory, i):\n",
" return trajectory[i];\n",
"\n",
"def start_time(trajectory):\n",