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
4807a7a0
Commit
4807a7a0
authored
Jul 18, 2019
by
Stefan Schuhbaeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove TraCICmdHandler interface from CommandHandler class.
This is only a functional Interface
parent
5518b3b8
Changes
424
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
424 changed files
with
47275 additions
and
2094 deletions
+47275
-2094
.gitignore
.gitignore
+5
-0
VadereAnnotation/src/org/vadere/annotation/traci/client/ClientAnnotationProcessor.java
...re/annotation/traci/client/ClientAnnotationProcessor.java
+290
-0
VadereAnnotation/src/org/vadere/annotation/traci/client/TraCIApi.java
...tion/src/org/vadere/annotation/traci/client/TraCIApi.java
+30
-0
VadereGui/src/org/vadere/gui/components/view/ScenarioElementView.java
...c/org/vadere/gui/components/view/ScenarioElementView.java
+1
-1
VadereGui/src/org/vadere/gui/projectview/control/ActionAbstractAddScenario.java
...re/gui/projectview/control/ActionAbstractAddScenario.java
+1
-1
VadereGui/src/org/vadere/gui/projectview/control/ActionCreateProject.java
...g/vadere/gui/projectview/control/ActionCreateProject.java
+12
-2
VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java
...org/vadere/gui/projectview/control/ActionLoadProject.java
+5
-6
VadereGui/src/org/vadere/gui/projectview/control/ActionRunSelectedScenarios.java
...e/gui/projectview/control/ActionRunSelectedScenarios.java
+2
-2
VadereGui/src/org/vadere/gui/projectview/model/ProjectViewModel.java
...rc/org/vadere/gui/projectview/model/ProjectViewModel.java
+15
-8
VadereGui/testResources/test-scenario.scenario
VadereGui/testResources/test-scenario.scenario
+3
-1
VadereGui/tests/org/vadere/gui/vadere/TestProjectWriterAndReader.java
...sts/org/vadere/gui/vadere/TestProjectWriterAndReader.java
+13
-12
VadereManager/pom.xml
VadereManager/pom.xml
+185
-0
VadereManager/resources/log4j2.properties
VadereManager/resources/log4j2.properties
+32
-0
VadereManager/src/org/vadere/manager/ClientHandler.java
VadereManager/src/org/vadere/manager/ClientHandler.java
+79
-0
VadereManager/src/org/vadere/manager/Manager.java
VadereManager/src/org/vadere/manager/Manager.java
+100
-0
VadereManager/src/org/vadere/manager/RemoteManager.java
VadereManager/src/org/vadere/manager/RemoteManager.java
+165
-0
VadereManager/src/org/vadere/manager/RemoteScenarioRun.java
VadereManager/src/org/vadere/manager/RemoteScenarioRun.java
+79
-0
VadereManager/src/org/vadere/manager/ServerView.java
VadereManager/src/org/vadere/manager/ServerView.java
+76
-0
VadereManager/src/org/vadere/manager/Subscription.java
VadereManager/src/org/vadere/manager/Subscription.java
+96
-0
VadereManager/src/org/vadere/manager/TraCIException.java
VadereManager/src/org/vadere/manager/TraCIException.java
+41
-0
VadereManager/src/org/vadere/manager/TraCISocket.java
VadereManager/src/org/vadere/manager/TraCISocket.java
+97
-0
VadereManager/src/org/vadere/manager/VadereServer.java
VadereManager/src/org/vadere/manager/VadereServer.java
+63
-0
VadereManager/src/org/vadere/manager/client/ConsoleCommand.java
...Manager/src/org/vadere/manager/client/ConsoleCommand.java
+9
-0
VadereManager/src/org/vadere/manager/client/ConsoleReader.java
...eManager/src/org/vadere/manager/client/ConsoleReader.java
+107
-0
VadereManager/src/org/vadere/manager/client/TestClient.java
VadereManager/src/org/vadere/manager/client/TestClient.java
+268
-0
VadereManager/src/org/vadere/manager/client/traci/TraCIClientApi.java
...r/src/org/vadere/manager/client/traci/TraCIClientApi.java
+14
-0
VadereManager/src/org/vadere/manager/traci/CmdType.java
VadereManager/src/org/vadere/manager/traci/CmdType.java
+13
-0
VadereManager/src/org/vadere/manager/traci/TraCICmd.java
VadereManager/src/org/vadere/manager/traci/TraCICmd.java
+111
-0
VadereManager/src/org/vadere/manager/traci/TraCIDataType.java
...reManager/src/org/vadere/manager/traci/TraCIDataType.java
+54
-0
VadereManager/src/org/vadere/manager/traci/TraCIVersion.java
VadereManager/src/org/vadere/manager/traci/TraCIVersion.java
+32
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/CommandExecutor.java
.../vadere/manager/traci/commandHandler/CommandExecutor.java
+53
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/CommandHandler.java
...g/vadere/manager/traci/commandHandler/CommandHandler.java
+143
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/ControlCommandHandler.java
...e/manager/traci/commandHandler/ControlCommandHandler.java
+128
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/PersonCommandHandler.java
...re/manager/traci/commandHandler/PersonCommandHandler.java
+295
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/PolygonCommandHandler.java
...e/manager/traci/commandHandler/PolygonCommandHandler.java
+185
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/SimulationCommandHandler.java
...anager/traci/commandHandler/SimulationCommandHandler.java
+143
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/StateAccessHandler.java
...dere/manager/traci/commandHandler/StateAccessHandler.java
+24
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/SubscriptionHandler.java
...ere/manager/traci/commandHandler/SubscriptionHandler.java
+12
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/TraCICmdHandler.java
.../vadere/manager/traci/commandHandler/TraCICmdHandler.java
+14
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/VehicleCommandHandler.java
...e/manager/traci/commandHandler/VehicleCommandHandler.java
+80
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/ControlHandler.java
...nager/traci/commandHandler/annotation/ControlHandler.java
+20
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/ControlHandlers.java
...ager/traci/commandHandler/annotation/ControlHandlers.java
+13
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/PersonHandler.java
...anager/traci/commandHandler/annotation/PersonHandler.java
+30
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/PersonHandlers.java
...nager/traci/commandHandler/annotation/PersonHandlers.java
+13
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/PolygonHandler.java
...nager/traci/commandHandler/annotation/PolygonHandler.java
+28
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/PolygonHandlers.java
...ager/traci/commandHandler/annotation/PolygonHandlers.java
+13
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/SimulationHandler.java
...er/traci/commandHandler/annotation/SimulationHandler.java
+28
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/SimulationHandlers.java
...r/traci/commandHandler/annotation/SimulationHandlers.java
+13
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/VehicleHandler.java
...nager/traci/commandHandler/annotation/VehicleHandler.java
+28
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/annotation/VehicleHandlers.java
...ager/traci/commandHandler/annotation/VehicleHandlers.java
+13
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/variables/ControlVar.java
...re/manager/traci/commandHandler/variables/ControlVar.java
+33
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/variables/PersonVar.java
...ere/manager/traci/commandHandler/variables/PersonVar.java
+63
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/variables/PolygonVar.java
...re/manager/traci/commandHandler/variables/PolygonVar.java
+35
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/variables/SimulationVar.java
...manager/traci/commandHandler/variables/SimulationVar.java
+47
-0
VadereManager/src/org/vadere/manager/traci/commandHandler/variables/VehicleVar.java
...re/manager/traci/commandHandler/variables/VehicleVar.java
+33
-0
VadereManager/src/org/vadere/manager/traci/commands/TraCICommand.java
...r/src/org/vadere/manager/traci/commands/TraCICommand.java
+107
-0
VadereManager/src/org/vadere/manager/traci/commands/TraCIGetCommand.java
...rc/org/vadere/manager/traci/commands/TraCIGetCommand.java
+90
-0
VadereManager/src/org/vadere/manager/traci/commands/TraCISetCommand.java
...rc/org/vadere/manager/traci/commands/TraCISetCommand.java
+84
-0
VadereManager/src/org/vadere/manager/traci/commands/TraCIValueSubscriptionCommand.java
...manager/traci/commands/TraCIValueSubscriptionCommand.java
+103
-0
VadereManager/src/org/vadere/manager/traci/commands/control/TraCICloseCommand.java
...ere/manager/traci/commands/control/TraCICloseCommand.java
+46
-0
VadereManager/src/org/vadere/manager/traci/commands/control/TraCIGetVersionCommand.java
...anager/traci/commands/control/TraCIGetVersionCommand.java
+42
-0
VadereManager/src/org/vadere/manager/traci/commands/control/TraCILoadCommand.java
...dere/manager/traci/commands/control/TraCILoadCommand.java
+28
-0
VadereManager/src/org/vadere/manager/traci/commands/control/TraCISendFileCommand.java
.../manager/traci/commands/control/TraCISendFileCommand.java
+53
-0
VadereManager/src/org/vadere/manager/traci/commands/control/TraCISendFileCommandV20_0_1.java
...r/traci/commands/control/TraCISendFileCommandV20_0_1.java
+42
-0
VadereManager/src/org/vadere/manager/traci/commands/control/TraCISimStepCommand.java
...e/manager/traci/commands/control/TraCISimStepCommand.java
+50
-0
VadereManager/src/org/vadere/manager/traci/reader/TraCIByteBuffer.java
.../src/org/vadere/manager/traci/reader/TraCIByteBuffer.java
+273
-0
VadereManager/src/org/vadere/manager/traci/reader/TraCICommandBuffer.java
...c/org/vadere/manager/traci/reader/TraCICommandBuffer.java
+49
-0
VadereManager/src/org/vadere/manager/traci/reader/TraCIPacketBuffer.java
...rc/org/vadere/manager/traci/reader/TraCIPacketBuffer.java
+86
-0
VadereManager/src/org/vadere/manager/traci/reader/TraCIReader.java
...ager/src/org/vadere/manager/traci/reader/TraCIReader.java
+70
-0
VadereManager/src/org/vadere/manager/traci/respons/StatusResponse.java
.../src/org/vadere/manager/traci/respons/StatusResponse.java
+90
-0
VadereManager/src/org/vadere/manager/traci/respons/TraCIGetResponse.java
...rc/org/vadere/manager/traci/respons/TraCIGetResponse.java
+100
-0
VadereManager/src/org/vadere/manager/traci/respons/TraCIGetVersionResponse.java
...vadere/manager/traci/respons/TraCIGetVersionResponse.java
+82
-0
VadereManager/src/org/vadere/manager/traci/respons/TraCIResponse.java
...r/src/org/vadere/manager/traci/respons/TraCIResponse.java
+110
-0
VadereManager/src/org/vadere/manager/traci/respons/TraCISimTimeResponse.java
...rg/vadere/manager/traci/respons/TraCISimTimeResponse.java
+65
-0
VadereManager/src/org/vadere/manager/traci/respons/TraCIStatusResponse.java
...org/vadere/manager/traci/respons/TraCIStatusResponse.java
+32
-0
VadereManager/src/org/vadere/manager/traci/respons/TraCISubscriptionResponse.java
...dere/manager/traci/respons/TraCISubscriptionResponse.java
+192
-0
VadereManager/src/org/vadere/manager/traci/sumo/LightPhase.java
...Manager/src/org/vadere/manager/traci/sumo/LightPhase.java
+25
-0
VadereManager/src/org/vadere/manager/traci/sumo/RoadMapPosition.java
...er/src/org/vadere/manager/traci/sumo/RoadMapPosition.java
+64
-0
VadereManager/src/org/vadere/manager/traci/sumo/TrafficLightPhase.java
.../src/org/vadere/manager/traci/sumo/TrafficLightPhase.java
+65
-0
VadereManager/src/org/vadere/manager/traci/writer/ByteArrayOutputStreamTraCIWriter.java
...anager/traci/writer/ByteArrayOutputStreamTraCIWriter.java
+305
-0
VadereManager/src/org/vadere/manager/traci/writer/TraCIPacket.java
...ager/src/org/vadere/manager/traci/writer/TraCIPacket.java
+255
-0
VadereManager/src/org/vadere/manager/traci/writer/TraCIWriter.java
...ager/src/org/vadere/manager/traci/writer/TraCIWriter.java
+94
-0
VadereManager/testResources/getVersionTest
VadereManager/testResources/getVersionTest
+1
-0
VadereManager/testResources/test004/vadere.project
VadereManager/testResources/test004/vadere.project
+1
-0
VadereManager/testResources/test005/scenarios/mf_small_simple.scenario
.../testResources/test005/scenarios/mf_small_simple.scenario
+1978
-0
VadereManager/testResources/test005/scenarios/s004.scenario
VadereManager/testResources/test005/scenarios/s004.scenario
+199
-0
VadereManager/testResources/test005/vadere.project
VadereManager/testResources/test005/vadere.project
+1
-0
VadereManager/testResources/testProject001/scenarios/mf_001.scenario
...er/testResources/testProject001/scenarios/mf_001.scenario
+10802
-0
VadereManager/testResources/testProject001/scenarios/mf_small.scenario
.../testResources/testProject001/scenarios/mf_small.scenario
+3156
-0
VadereManager/testResources/testProject001/scenarios/mf_small_simple.scenario
...sources/testProject001/scenarios/mf_small_simple.scenario
+1995
-0
VadereManager/testResources/testProject001/scenarios/roVerTest001.scenario
...tResources/testProject001/scenarios/roVerTest001.scenario
+295
-0
VadereManager/testResources/testProject001/scenarios/scenario001.scenario
...stResources/testProject001/scenarios/scenario001.scenario
+216
-0
VadereManager/testResources/testProject001/scenarios/scenario002.scenario
...stResources/testProject001/scenarios/scenario002.scenario
+293
-0
VadereManager/testResources/testProject001/vadere.project
VadereManager/testResources/testProject001/vadere.project
+1
-0
VadereManager/testResources/testTCP
VadereManager/testResources/testTCP
+2
-0
VadereManager/tests/org/vadere/manager/TraCISocketTest.java
VadereManager/tests/org/vadere/manager/TraCISocketTest.java
+19
-0
VadereManager/tests/org/vadere/manager/traci/ByteArrayOutputStreamTraCIWriterTest.java
...e/manager/traci/ByteArrayOutputStreamTraCIWriterTest.java
+375
-0
VadereManager/tests/org/vadere/manager/traci/TraCIReaderTest.java
...nager/tests/org/vadere/manager/traci/TraCIReaderTest.java
+240
-0
VadereManager/tests/org/vadere/manager/traci/respons/StatusResponseTest.java
.../org/vadere/manager/traci/respons/StatusResponseTest.java
+79
-0
VadereManager/tests/org/vadere/manager/traci/respons/TraCIGetResponseTest.java
...rg/vadere/manager/traci/respons/TraCIGetResponseTest.java
+31
-0
VadereManager/tests/org/vadere/manager/traci/respons/TraCIGetVersionResponseTest.java
...re/manager/traci/respons/TraCIGetVersionResponseTest.java
+27
-0
VadereModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario
...OSMGroup_calibration/scenarios/groupBaseScenario.scenario
+80
-71
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_2group.scenario
+19
-24
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_2group_sparse.scenario
+24
-28
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_3group.scenario
+19
-24
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_3group_sparse.scenario
+24
-28
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_4group.scenario
+19
-24
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_4group_sparse.scenario
+24
-28
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_5group.scenario
+19
-24
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_5group_sparse.scenario
+24
-28
VadereModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario
.../TestOSM_calibration/scenarios/groupBaseScenario.scenario
+50
-54
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario
...m_calibration_minStepSize_0_11_ignore_free_space.scenario
+52
-52
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario
...ation/scenarios/osm_calibration_minStepSize_0_17.scenario
+43
-43
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario
...ation/scenarios/osm_calibration_minStepSize_0_25.scenario
+43
-43
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario
...ation/scenarios/osm_calibration_minStepSize_0_35.scenario
+43
-43
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario
...ion/scenarios/osm_calibration_minStepSize_0_4625.scenario
+43
-43
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario
...scenarios/osm_calibration_minStepSize_0_4625_p18.scenario
+43
-43
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario
.../scenarios/osm_calibration_minStepSize_0_4625_p4.scenario
+43
-43
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario
...libration/scenarios/osm_calibration_sivers_2016b.scenario
+43
-43
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
...n/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
...stOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
+4
-18
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
+4
-21
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
+4
-21
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
...enarios/floor_field_navigation_test_displaced_ok.scenario
+3
-1
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario
...TestBHM/scenarios/floor_field_navigation_test_ok.scenario
+3
-1
VadereModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario
...supported_event_exception_for_unsupported_models.scenario
+3
-1
VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario
...ents/BangEvent/scenarios/02_bang_event_one_agent.scenario
+3
-1
VadereModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario
...angEvent/scenarios/03_bang_event_multiple_agents.scenario
+3
-1
VadereModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario
...t/scenarios/04_bang_event_one_agent_one_obstacle.scenario
+3
-1
VadereModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario
...angEvent/scenarios/05_bang_event_narrowed_street.scenario
+3
-1
VadereModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario
...angEvent/scenarios/06_bang_event_guimaraes_platz.scenario
+3
-1
VadereModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario
...entEvents/scenarios/01_wait_event_osm_sequential.scenario
+3
-1
VadereModelTests/TestEvents/DifferentEvents/scenarios/02_wait_event_osm_event_driven.scenario
...tEvents/scenarios/02_wait_event_osm_event_driven.scenario
+3
-1
VadereModelTests/TestEvents/DifferentEvents/scenarios/03_wait_event_recurring_osm_sequential.scenario
...scenarios/03_wait_event_recurring_osm_sequential.scenario
+3
-1
VadereModelTests/TestEvents/DifferentEvents/scenarios/04_wait_in_area_event_osm_sequential.scenario
...s/scenarios/04_wait_in_area_event_osm_sequential.scenario
+3
-1
VadereModelTests/TestEvents/DifferentEvents/scenarios/05_wait_in_area_event_bhm.scenario
...ferentEvents/scenarios/05_wait_in_area_event_bhm.scenario
+1
-1
VadereModelTests/TestEvents/DifferentEvents/scenarios/06_bang_event_osm_sequential.scenario
...entEvents/scenarios/06_bang_event_osm_sequential.scenario
+3
-1
VadereModelTests/TestEvents/DifferentEvents/scenarios/07_bang_event_osm_event_driven.scenario
...tEvents/scenarios/07_bang_event_osm_event_driven.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
...odelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
...TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
...odelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
...odelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
...delTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
...ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
...sts/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
...sts/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
...ests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
...ts/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
...Tests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
+3
-1
VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
...ests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
+3
-1
VadereModelTests/TestNelderMead/scenarios/counterflow.scenario
...eModelTests/TestNelderMead/scenarios/counterflow.scenario
+3
-1
VadereModelTests/TestNelderMead/scenarios/labyrinth.scenario
VadereModelTests/TestNelderMead/scenarios/labyrinth.scenario
+3
-1
VadereModelTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario
...ad/scenarios/rimea_11_exit_selection_nelder_mead.scenario
+3
-1
VadereModelTests/TestNelderMead/scenarios/s2ucre.scenario
VadereModelTests/TestNelderMead/scenarios/s2ucre.scenario
+3
-1
VadereModelTests/TestNonWorkingFeatures/scenarios/cooperative_behavior_agents_get_stuck.scenario
.../scenarios/cooperative_behavior_agents_get_stuck.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
...SMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario
...enarios/VadereSimulation-GroupBehavior_no_groups.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
...s/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario
...MGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
.../TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario
...roup/scenarios/group_OSM_1Source2Places_noGroups.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
.../TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
...arios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
...cenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
+3
-1
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
+3
-1
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
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
...MGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
...MGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
+3
-1
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
+3
-1
VadereModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario
...TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario
+1
-1
VadereModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario
...TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario
+1
-1
VadereModelTests/TestOVM/scenarios/testtrafficlight.scenario
VadereModelTests/TestOVM/scenarios/testtrafficlight.scenario
+3
-1
VadereModelTests/TestRSM/scenarios/Reynolds_test.scenario
VadereModelTests/TestRSM/scenarios/Reynolds_test.scenario
+1
-1
VadereModelTests/TestRSM/scenarios/Reynolds_test_displaced.scenario
...lTests/TestRSM/scenarios/Reynolds_test_displaced.scenario
+1
-1
VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario
...odelTests/TestSFM/scenarios/basic_1_chicken_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario
...TestSFM/scenarios/basic_1_chicken_sfm1_displaced.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario
...odelTests/TestSFM/scenarios/basic_1_chicken_sfm2.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario
...odelTests/TestSFM/scenarios/basic_2_density_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_3_1_wall_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_3_2_wall_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_3_3_wall_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario
...ModelTests/TestSFM/scenarios/basic_4_1_wall_sfm2.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario
...ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario
...ModelTests/TestSFM/scenarios/basic_4_2_wall_sfm2.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario
...delTests/TestSFM/scenarios/rimea_01_pathway_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario
...delTests/TestSFM/scenarios/rimea_01_pathway_sfm2.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario
...Tests/TestSFM/scenarios/rimea_04_flow_sfm1_025_h.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario
...Tests/TestSFM/scenarios/rimea_04_flow_sfm1_050_h.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario
...Tests/TestSFM/scenarios/rimea_04_flow_sfm1_075_h.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario
...Tests/TestSFM/scenarios/rimea_04_flow_sfm1_100_h.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario
...Tests/TestSFM/scenarios/rimea_04_flow_sfm1_125_h.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario
...ModelTests/TestSFM/scenarios/rimea_05_react_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario
...odelTests/TestSFM/scenarios/rimea_06_corner_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario
...odelTests/TestSFM/scenarios/rimea_07_speeds_sfm1.scenario
+3
-1
VadereModelTests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario
...ests/TestSFM/scenarios/rimea_10_pathfinding_sfm1.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario
...ios/01-ExperimentSetup-OSMEventDriven-SBDisabled.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario
...rios/02-ExperimentSetup-OSMEventDriven-SBEnabled.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/03-ExperimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario
...perimentSetup-OSMEventDriven-SBEnabled-PSAdapted.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario
...arios/04-ExperimentSetup-OSMSequential-SBEnabled.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario
...os/05-UnidirectionalFlow-OSMSequential-SBEnabled.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario
...cenarios/06-CounterFlow-OSMSequential-SBDisabled.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario
...scenarios/07-CounterFlow-OSMSequential-SBEnabled.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/08-CounterFlow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario
...Flow-OSMSequential-SBEnabled-SearchRadiusAdapted.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/09-OriginalExperimentSetup-OSMEventDriven.scenario
...narios/09-OriginalExperimentSetup-OSMEventDriven.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByHeight.scenario
...scenarios/TestSpeedInAreaProcessor-SpeedByHeight.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByTrajectory.scenario
...arios/TestSpeedInAreaProcessor-SpeedByTrajectory.scenario
+3
-1
VadereModelTests/TestSalientBehavior/scenarios/TestSpeedInAreaProcessor-SpeedByWidth.scenario
.../scenarios/TestSpeedInAreaProcessor-SpeedByWidth.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_1_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_1_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_2_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_2_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_3_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_3_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_4_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario
...lTests/TestStairs/scenarios/stairs_diagonal_4_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario
...TestStairs/scenarios/stairs_diagonal_both_1_2_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario
...TestStairs/scenarios/stairs_diagonal_both_1_2_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario
...TestStairs/scenarios/stairs_diagonal_both_3_4_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario
...TestStairs/scenarios/stairs_diagonal_both_3_4_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_down_+1.scenario
...Stairs/scenarios/stairs_upward_direction_down_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_down_-1.scenario
...Stairs/scenarios/stairs_upward_direction_down_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_+1.scenario
...rs/scenarios/stairs_upward_direction_to_right_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_to_right_-1.scenario
...rs/scenarios/stairs_upward_direction_to_right_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_+1.scenario
...airs/scenarios/stairs_upward_direction_toleft_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_toleft_-1.scenario
...airs/scenarios/stairs_upward_direction_toleft_-1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_up_+1.scenario
...stStairs/scenarios/stairs_upward_direction_up_+1.scenario
+3
-1
VadereModelTests/TestStairs/scenarios/stairs_upward_direction_up_-1.scenario
...stStairs/scenarios/stairs_upward_direction_up_-1.scenario
+3
-1
VadereScenarios/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario
...ios/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario
+3
-1
VadereScenarios/bus_station/scenarios/bus_station.scenario
VadereScenarios/bus_station/scenarios/bus_station.scenario
+3
-1
VadereScenarios/roVer/scenarios/mf_001.scenario
VadereScenarios/roVer/scenarios/mf_001.scenario
+10785
-0
VadereScenarios/roVer/scenarios/mf_small.scenario
VadereScenarios/roVer/scenarios/mf_small.scenario
+3139
-0
VadereScenarios/roVer/scenarios/mf_small_simple.scenario
VadereScenarios/roVer/scenarios/mf_small_simple.scenario
+1978
-0
VadereScenarios/roVer/scenarios/roVerTest001.scenario
VadereScenarios/roVer/scenarios/roVerTest001.scenario
+278
-0
VadereScenarios/roVer/scenarios/scenario001.scenario
VadereScenarios/roVer/scenarios/scenario001.scenario
+199
-0
VadereScenarios/roVer/scenarios/scenario002.scenario
VadereScenarios/roVer/scenarios/scenario002.scenario
+276
-0
VadereScenarios/roVer/vadere.project
VadereScenarios/roVer/vadere.project
+1
-0
VadereSimulator/src/org/vadere/simulator/context/Context.java
...reSimulator/src/org/vadere/simulator/context/Context.java
+60
-0
VadereSimulator/src/org/vadere/simulator/context/ContextException.java
...or/src/org/vadere/simulator/context/ContextException.java
+19
-0
VadereSimulator/src/org/vadere/simulator/context/Provider.java
...eSimulator/src/org/vadere/simulator/context/Provider.java
+6
-0
VadereSimulator/src/org/vadere/simulator/context/VadereContext.java
...lator/src/org/vadere/simulator/context/VadereContext.java
+45
-0
VadereSimulator/src/org/vadere/simulator/control/OfflineTopographyController.java
...vadere/simulator/control/OfflineTopographyController.java
+4
-1
VadereSimulator/src/org/vadere/simulator/control/ScenarioRun.java
...mulator/src/org/vadere/simulator/control/ScenarioRun.java
+35
-8
VadereSimulator/src/org/vadere/simulator/control/Simulation.java
...imulator/src/org/vadere/simulator/control/Simulation.java
+5
-1
VadereSimulator/src/org/vadere/simulator/control/TopographyController.java
...rc/org/vadere/simulator/control/TopographyController.java
+2
-2
VadereSimulator/src/org/vadere/simulator/entrypoints/Version.java
...mulator/src/org/vadere/simulator/entrypoints/Version.java
+2
-2
VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/commands/ProjectRunSubCommand.java
...ulator/entrypoints/cmd/commands/ProjectRunSubCommand.java
+3
-1
VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/commands/ScenarioRunSubCommand.java
...lator/entrypoints/cmd/commands/ScenarioRunSubCommand.java
+4
-1
VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/commands/SuqSubCommand.java
...ere/simulator/entrypoints/cmd/commands/SuqSubCommand.java
+4
-1
VadereSimulator/src/org/vadere/simulator/models/MainModelBuilder.java
...tor/src/org/vadere/simulator/models/MainModelBuilder.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/Model.java
VadereSimulator/src/org/vadere/simulator/models/Model.java
+4
-5
VadereSimulator/src/org/vadere/simulator/models/bhm/BehaviouralHeuristicsModel.java
...dere/simulator/models/bhm/BehaviouralHeuristicsModel.java
+8
-9
VadereSimulator/src/org/vadere/simulator/models/bmm/BiomechanicsModel.java
...rc/org/vadere/simulator/models/bmm/BiomechanicsModel.java
+2
-1
VadereSimulator/src/org/vadere/simulator/models/gnm/GradientNavigationModel.java
.../vadere/simulator/models/gnm/GradientNavigationModel.java
+2
-1
VadereSimulator/src/org/vadere/simulator/models/gnm/PotentialFieldObstacleGNM.java
...adere/simulator/models/gnm/PotentialFieldObstacleGNM.java
+9
-8
VadereSimulator/src/org/vadere/simulator/models/gnm/PotentialFieldPedestrianGNM.java
...ere/simulator/models/gnm/PotentialFieldPedestrianGNM.java
+7
-6
VadereSimulator/src/org/vadere/simulator/models/groups/cgm/CentroidGroupModel.java
...adere/simulator/models/groups/cgm/CentroidGroupModel.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/groups/cgm/CentroidGroupPotential.java
...e/simulator/models/groups/cgm/CentroidGroupPotential.java
+1
-0
VadereSimulator/src/org/vadere/simulator/models/osm/OptimalStepsModel.java
...rc/org/vadere/simulator/models/osm/OptimalStepsModel.java
+13
-17
VadereSimulator/src/org/vadere/simulator/models/ovm/OptimalVelocityModel.java
...org/vadere/simulator/models/ovm/OptimalVelocityModel.java
+1
-0
VadereSimulator/src/org/vadere/simulator/models/potential/PedestrianRepulsionPotentialCycle.java
...r/models/potential/PedestrianRepulsionPotentialCycle.java
+7
-6
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldObstacleCompact.java
...lator/models/potential/PotentialFieldObstacleCompact.java
+9
-8
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldObstacleCompactSoftshell.java
...els/potential/PotentialFieldObstacleCompactSoftshell.java
+2
-1
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldObstacleOSM.java
...simulator/models/potential/PotentialFieldObstacleOSM.java
+9
-8
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldObstacleRingExperiment.java
...odels/potential/PotentialFieldObstacleRingExperiment.java
+7
-6
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldPedestrianCompact.java
...tor/models/potential/PotentialFieldPedestrianCompact.java
+9
-8
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldPedestrianCompactSoftshell.java
...s/potential/PotentialFieldPedestrianCompactSoftshell.java
+8
-8
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldPedestrianOSM.java
...mulator/models/potential/PotentialFieldPedestrianOSM.java
+7
-6
VadereSimulator/src/org/vadere/simulator/models/potential/fields/IPotentialField.java
...re/simulator/models/potential/fields/IPotentialField.java
+8
-133
VadereSimulator/src/org/vadere/simulator/models/potential/fields/IPotentialFieldTargetGrid.java
...or/models/potential/fields/IPotentialFieldTargetGrid.java
+6
-5
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldDistancesBruteForce.java
...s/potential/fields/PotentialFieldDistancesBruteForce.java
+46
-5
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldSingleTargetGrid.java
...dels/potential/fields/PotentialFieldSingleTargetGrid.java
+7
-7
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTarget.java
...mulator/models/potential/fields/PotentialFieldTarget.java
+1
-2
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTargetGrid.java
...tor/models/potential/fields/PotentialFieldTargetGrid.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTargetMesh.java
...tor/models/potential/fields/PotentialFieldTargetMesh.java
+0
-3
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTargetRingExperiment.java
.../potential/fields/PotentialFieldTargetRingExperiment.java
+3
-3
VadereSimulator/src/org/vadere/simulator/models/potential/solver/EikonalSolverCacheProvider.java
...r/models/potential/solver/EikonalSolverCacheProvider.java
+63
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/EikonalSolverDefaultProvider.java
...models/potential/solver/EikonalSolverDefaultProvider.java
+27
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/EikonalSolverProvider.java
...ulator/models/potential/solver/EikonalSolverProvider.java
+162
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/EikonalSolver.java
...or/models/potential/solver/calculators/EikonalSolver.java
+34
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/GridEikonalSolver.java
...ntial/solver/calculators/cartesian/GridEikonalSolver.java
+30
-2
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/PotentialFieldCalculatorAirLine.java
...alculators/cartesian/PotentialFieldCalculatorAirLine.java
+3
-3
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/PotentialFieldCalculatorDijkstra.java
...lculators/cartesian/PotentialFieldCalculatorDijkstra.java
+6
-6
VadereSimulator/src/org/vadere/simulator/models/queuing/PotentialFieldTargetQueuingGrid.java
...lator/models/queuing/PotentialFieldTargetQueuingGrid.java
+2
-1
VadereSimulator/src/org/vadere/simulator/models/reynolds/ReynoldsSteeringModel.java
...dere/simulator/models/reynolds/ReynoldsSteeringModel.java
+9
-8
VadereSimulator/src/org/vadere/simulator/models/seating/SeatingModel.java
...src/org/vadere/simulator/models/seating/SeatingModel.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/sfm/PotentialFieldObstacleSFM.java
...adere/simulator/models/sfm/PotentialFieldObstacleSFM.java
+11
-10
VadereSimulator/src/org/vadere/simulator/models/sfm/PotentialFieldPedestrianSFM.java
...ere/simulator/models/sfm/PotentialFieldPedestrianSFM.java
+7
-7
VadereSimulator/src/org/vadere/simulator/models/sfm/SocialForceModel.java
...src/org/vadere/simulator/models/sfm/SocialForceModel.java
+2
-1
VadereSimulator/src/org/vadere/simulator/projects/VadereProject.java
...ator/src/org/vadere/simulator/projects/VadereProject.java
+22
-13
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/DataProcessingJsonManager.java
...or/projects/dataprocessing/DataProcessingJsonManager.java
+0
-1
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianCrossingTimeProcessor.java
...processing/processor/PedestrianCrossingTimeProcessor.java
+0
-1
VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/TargetFloorFieldGridProcessor.java
...taprocessing/processor/TargetFloorFieldGridProcessor.java
+5
-2
VadereSimulator/src/org/vadere/simulator/projects/io/IOOutput.java
...ulator/src/org/vadere/simulator/projects/io/IOOutput.java
+1
-1
VadereSimulator/src/org/vadere/simulator/projects/io/IOVadere.java
...ulator/src/org/vadere/simulator/projects/io/IOVadere.java
+6
-6
VadereSimulator/src/org/vadere/simulator/projects/migration/incident/helper/MigrationUtil.java
...tor/projects/migration/incident/helper/MigrationUtil.java
+1
-1
VadereSimulator/src/org/vadere/simulator/projects/migration/incident/incidents/ExceptionIncident.java
...jects/migration/incident/incidents/ExceptionIncident.java
+0
-1
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonNodeExplorer.java
...rojects/migration/jsontranformation/JsonNodeExplorer.java
+15
-0
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/SimpleJsonTransformation.java
...migration/jsontranformation/SimpleJsonTransformation.java
+0
-1
VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformationV1_1ToV1_2.java
.../jsontranformation/json/JsonTransformationV1_1ToV1_2.java
+35
-0
VadereSimulator/src/org/vadere/simulator/triangulation/RealWorldPlot.java
...src/org/vadere/simulator/triangulation/RealWorldPlot.java
+5
-2
VadereSimulator/src/org/vadere/simulator/utils/cache/AbstractCacheObject.java
...org/vadere/simulator/utils/cache/AbstractCacheObject.java
+43
-0
VadereSimulator/src/org/vadere/simulator/utils/cache/CacheException.java
.../src/org/vadere/simulator/utils/cache/CacheException.java
+19
-0
VadereSimulator/src/org/vadere/simulator/utils/cache/CellGridBinaryCacheObject.java
...dere/simulator/utils/cache/CellGridBinaryCacheObject.java
+43
-0
VadereSimulator/src/org/vadere/simulator/utils/cache/CellGridTxtCacheObject.java
.../vadere/simulator/utils/cache/CellGridTxtCacheObject.java
+41
-0
VadereSimulator/src/org/vadere/simulator/utils/cache/ICacheObject.java
...or/src/org/vadere/simulator/utils/cache/ICacheObject.java
+44
-0
VadereSimulator/src/org/vadere/simulator/utils/cache/ICellGridCacheObject.java
...rg/vadere/simulator/utils/cache/ICellGridCacheObject.java
+6
-0
VadereSimulator/src/org/vadere/simulator/utils/cache/ScenarioCache.java
...r/src/org/vadere/simulator/utils/cache/ScenarioCache.java
+171
-0
VadereSimulator/testResources/data/ScenarioChecker/ScenarioCheckerTest.scenario
...sources/data/ScenarioChecker/ScenarioCheckerTest.scenario
+3
-1
VadereSimulator/testResources/data/VTestMultiRun.bak/output/Test1_2015-03-11_17-42-08.826/snapshot.scenario
...ak/output/Test1_2015-03-11_17-42-08.826/snapshot.scenario
+3
-1
VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test1.scenario
...Resources/data/VTestMultiRun.bak/scenarios/Test1.scenario
+3
-1
VadereSimulator/testResources/data/VTestMultiRun.bak/scenarios/Test2.scenario
...Resources/data/VTestMultiRun.bak/scenarios/Test2.scenario
+3
-1
VadereSimulator/testResources/data/VTestMultiRun/output/Test1_2015-03-11_17-42-08.826/snapshot.scenario
...un/output/Test1_2015-03-11_17-42-08.826/snapshot.scenario
+3
-1
VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test1.scenario
...testResources/data/VTestMultiRun/scenarios/Test1.scenario
+3
-1
VadereSimulator/testResources/data/VTestMultiRun/scenarios/Test2.scenario
...testResources/data/VTestMultiRun/scenarios/Test2.scenario
+3
-1
VadereSimulator/testResources/data/basic_1_chicken_osm1.scenario
...imulator/testResources/data/basic_1_chicken_osm1.scenario
+3
-1
VadereSimulator/testResources/data/cache/s001.scenario
VadereSimulator/testResources/data/cache/s001.scenario
+276
-0
VadereSimulator/testResources/data/cache/s002.scenario
VadereSimulator/testResources/data/cache/s002.scenario
+276
-0
VadereSimulator/testResources/data/cache/s003.scenario
VadereSimulator/testResources/data/cache/s003.scenario
+276
-0
VadereSimulator/testResources/data/corruptedOutput/test_postvis_2018-01-19_13-38-11.666/test_postvis.scenario
...est_postvis_2018-01-19_13-38-11.666/test_postvis.scenario
+3
-1
VadereSimulator/testResources/data/simpleProject/scenarios/test_postvis.scenario
...ources/data/simpleProject/scenarios/test_postvis.scenario
+3
-1
VadereSimulator/testResources/data/simpleProject/scenarios/warteschlange_ein_ziel.scenario
...a/simpleProject/scenarios/warteschlange_ein_ziel.scenario
+3
-1
VadereSimulator/testResources/data/testOutput2/test_postvis.scenario
...ator/testResources/data/testOutput2/test_postvis.scenario
+3
-1
VadereSimulator/testResources/migration/v1_1_to_v1_2/s001.scenario
...ulator/testResources/migration/v1_1_to_v1_2/s001.scenario
+276
-0
VadereSimulator/testResources/migration/v1_1_to_v1_2/s002.scenario
...ulator/testResources/migration/v1_1_to_v1_2/s002.scenario
+276
-0
VadereSimulator/testResources/org/vadere/simulator/entrypoints/test.scenario
...tResources/org/vadere/simulator/entrypoints/test.scenario
+3
-1
VadereSimulator/tests/org/vadere/simulator/dataprocessing/TestOutputFile.java
...s/org/vadere/simulator/dataprocessing/TestOutputFile.java
+7
-7
VadereSimulator/tests/org/vadere/simulator/dataprocessing/TestTrajectoryReader.java
...vadere/simulator/dataprocessing/TestTrajectoryReader.java
+3
-3
VadereSimulator/tests/org/vadere/simulator/entrypoints/MigrationSubCommandTest.java
...vadere/simulator/entrypoints/MigrationSubCommandTest.java
+2
-3
VadereSimulator/tests/org/vadere/simulator/models/osm/OSMBehaviorControllerTest.java
...adere/simulator/models/osm/OSMBehaviorControllerTest.java
+1
-1
VadereSimulator/tests/org/vadere/simulator/projects/ProjectOutputTest.java
...ests/org/vadere/simulator/projects/ProjectOutputTest.java
+3
-4
VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianTargetIdProcessorTest.java
...processing/processor/PedestrianTargetIdProcessorTest.java
+1
-1
VadereSimulator/tests/org/vadere/simulator/projects/migration/JoltIdentityTransformationTest.java
...or/projects/migration/JoltIdentityTransformationTest.java
+0
-3
VadereSimulator/tests/org/vadere/simulator/projects/migration/JsonMigrationAssistantTest.java
...ulator/projects/migration/JsonMigrationAssistantTest.java
+2
-3
VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/JsonTransformationTest.java
...s/migration/jsontranformation/JsonTransformationTest.java
+3
-4
VadereSimulator/tests/org/vadere/simulator/projects/migration/jsontranformation/json/JsonTransformationV1_1ToV1_2Test.java
...ntranformation/json/JsonTransformationV1_1ToV1_2Test.java
+51
-0
VadereSimulator/tests/org/vadere/simulator/utils/ScenarioCheckerTest.java
...tests/org/vadere/simulator/utils/ScenarioCheckerTest.java
+2
-2
VadereSimulator/tests/org/vadere/simulator/utils/cache/ScenarioCacheTest.java
...s/org/vadere/simulator/utils/cache/ScenarioCacheTest.java
+103
-0
VadereSimulator/tests/org/vadere/simulator/utils/reflection/TestJsonNodeExplorer.java
...dere/simulator/utils/reflection/TestJsonNodeExplorer.java
+3
-4
VadereSimulator/tests/org/vadere/simulator/utils/reflection/TestResourceHandlerScenario.java
...mulator/utils/reflection/TestResourceHandlerScenario.java
+30
-0
VadereState/src/org/vadere/state/attributes/models/AttributesFloorField.java
.../vadere/state/attributes/models/AttributesFloorField.java
+75
-2
VadereState/src/org/vadere/state/attributes/scenario/AttributesSource.java
...rg/vadere/state/attributes/scenario/AttributesSource.java
+19
-4
VadereState/src/org/vadere/state/attributes/scenario/AttributesTarget.java
...rg/vadere/state/attributes/scenario/AttributesTarget.java
+52
-0
VadereState/src/org/vadere/state/scenario/Topography.java
VadereState/src/org/vadere/state/scenario/Topography.java
+23
-2
VadereState/src/org/vadere/state/simulation/Trajectory.java
VadereState/src/org/vadere/state/simulation/Trajectory.java
+11
-0
VadereState/src/org/vadere/state/types/CacheType.java
VadereState/src/org/vadere/state/types/CacheType.java
+5
-0
VadereState/src/org/vadere/state/util/StateJsonConverter.java
...reState/src/org/vadere/state/util/StateJsonConverter.java
+58
-2
VadereState/src/org/vadere/state/util/Views.java
VadereState/src/org/vadere/state/util/Views.java
+35
-0
VadereState/tests/org/vadere/state/util/StateJsonConverterTest.java
...e/tests/org/vadere/state/util/StateJsonConverterTest.java
+82
-4
VadereUtils/src/org/vadere/util/data/FloorFieldGridRow.java
VadereUtils/src/org/vadere/util/data/FloorFieldGridRow.java
+4
-0
VadereUtils/src/org/vadere/util/data/cellgrid/CellGrid.java
VadereUtils/src/org/vadere/util/data/cellgrid/CellGrid.java
+51
-7
VadereUtils/src/org/vadere/util/data/cellgrid/CellGridReadWriter.java
...src/org/vadere/util/data/cellgrid/CellGridReadWriter.java
+170
-0
VadereUtils/src/org/vadere/util/data/cellgrid/CellState.java
VadereUtils/src/org/vadere/util/data/cellgrid/CellState.java
+15
-0
VadereUtils/src/org/vadere/util/data/cellgrid/PathFindingTag.java
...ils/src/org/vadere/util/data/cellgrid/PathFindingTag.java
+7
-0
VadereUtils/src/org/vadere/util/io/IDataReader.java
VadereUtils/src/org/vadere/util/io/IDataReader.java
+14
-0
VadereUtils/src/org/vadere/util/io/IDataWriter.java
VadereUtils/src/org/vadere/util/io/IDataWriter.java
+10
-0
VadereUtils/src/org/vadere/util/test/TestResourceHandler.java
...reUtils/src/org/vadere/util/test/TestResourceHandler.java
+1
-14
VadereUtils/src/org/vadere/util/test/TestUtils.java
VadereUtils/src/org/vadere/util/test/TestUtils.java
+1
-1
VadereUtils/testResources/org/vadere/util/data/cellgrid/test001.bincache
...tResources/org/vadere/util/data/cellgrid/test001.bincache
+0
-0
VadereUtils/testResources/org/vadere/util/data/cellgrid/test001.ffcache
...stResources/org/vadere/util/data/cellgrid/test001.ffcache
+17
-0
VadereUtils/tests/org/vadere/util/data/cellgrid/CellGridReadWriterTest.java
...org/vadere/util/data/cellgrid/CellGridReadWriterTest.java
+74
-0
VadereUtils/tests/org/vadere/util/data/cellgrid/CellGridTest.java
...ils/tests/org/vadere/util/data/cellgrid/CellGridTest.java
+78
-0
pom.xml
pom.xml
+1
-0
No files found.
.gitignore
View file @
4807a7a0
...
...
@@ -44,6 +44,7 @@ VadereModelCalibration/**/output
VadereModelTests/**/legacy
VadereUtils/output/**
VadereModelTests/*_private
**/current_commit_hash.txt
# Operating system files
.DS_Store
...
...
@@ -53,3 +54,7 @@ VadereModelTests/*_private
**/output/
**/legacy/
**/*_private/
# Vadere Cache
**/__cache__
**/vadere-server-output
\ No newline at end of file
VadereAnnotation/src/org/vadere/annotation/traci/client/ClientAnnotationProcessor.java
0 → 100644
View file @
4807a7a0
package
org.vadere.annotation.traci.client
;
import
com.google.auto.service.AutoService
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.stream.Collectors
;
import
javax.annotation.processing.AbstractProcessor
;
import
javax.annotation.processing.Processor
;
import
javax.annotation.processing.RoundEnvironment
;
import
javax.annotation.processing.SupportedAnnotationTypes
;
import
javax.annotation.processing.SupportedSourceVersion
;
import
javax.lang.model.SourceVersion
;
import
javax.lang.model.element.AnnotationMirror
;
import
javax.lang.model.element.AnnotationValue
;
import
javax.lang.model.element.Element
;
import
javax.lang.model.element.ElementKind
;
import
javax.lang.model.element.ExecutableElement
;
import
javax.lang.model.element.Modifier
;
import
javax.lang.model.element.TypeElement
;
import
javax.lang.model.type.MirroredTypeException
;
import
javax.tools.JavaFileObject
;
@SupportedAnnotationTypes
(
"org.vadere.annotation.traci.client.TraCIApi"
)
@SupportedSourceVersion
(
SourceVersion
.
RELEASE_11
)
@AutoService
(
Processor
.
class
)
public
class
ClientAnnotationProcessor
extends
AbstractProcessor
{
private
StringBuilder
apiMembers
;
private
StringBuilder
apiInit
;
private
StringBuilder
apiMapping
;
private
StringBuilder
apiAbstract
;
@Override
public
boolean
process
(
Set
<?
extends
TypeElement
>
annotations
,
RoundEnvironment
roundEnv
)
{
apiMembers
=
new
StringBuilder
();
apiInit
=
new
StringBuilder
();
apiMapping
=
new
StringBuilder
();
apiAbstract
=
new
StringBuilder
();
// see SupportedAnnotationTypes (here only TraCIApi)
for
(
TypeElement
annotation
:
annotations
)
{
Set
<?
extends
Element
>
annotatedElements
=
roundEnv
.
getElementsAnnotatedWith
(
annotation
)
.
stream
()
.
filter
(
e
->
e
.
getKind
().
isClass
()
&&
!
e
.
getKind
().
equals
(
ElementKind
.
ENUM
)
&&
!
e
.
getModifiers
().
contains
(
Modifier
.
ABSTRACT
)
)
.
collect
(
Collectors
.
toSet
());
if
(
annotatedElements
.
isEmpty
())
continue
;
for
(
Element
annotatedElement
:
annotatedElements
)
{
try
{
writeApiClass
(
annotatedElement
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
}
}
try
{
TypeElement
element
=
processingEnv
.
getElementUtils
().
getTypeElement
(
"org.vadere.manager.client.AbstractTestClient"
);
if
(
element
==
null
)
writeAbstractTestClient
();
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
true
;
}
protected
void
writeAbstractTestClient
()
throws
IOException
{
JavaFileObject
jFile
=
processingEnv
.
getFiler
().
createSourceFile
(
"AbstractTestClient"
);
try
(
PrintWriter
writer
=
new
PrintWriter
(
jFile
.
openWriter
())){
writer
.
append
(
"package org.vadere.manager.client; "
).
println
();
writer
.
println
();
writer
.
append
(
"import org.vadere.manager.TraCISocket;"
).
println
();
writer
.
append
(
"import org.vadere.manager.client.ConsoleReader;"
).
println
();
writer
.
append
(
"import java.io.IOException;"
).
println
();
writer
.
println
();
writer
.
append
(
"public abstract class AbstractTestClient {"
).
println
();
writer
.
append
(
apiMembers
.
toString
()).
println
();
writer
.
append
(
"\tpublic AbstractTestClient() { }"
).
println
();
writer
.
println
();
writer
.
append
(
"\tpublic void init(TraCISocket socket, ConsoleReader consoleReader){"
).
println
();
writer
.
append
(
apiInit
.
toString
());
writer
.
println
();
writer
.
append
(
apiMapping
.
toString
());
writer
.
append
(
"\t}"
).
println
();
writer
.
println
();
writer
.
append
(
apiAbstract
.
toString
());
writer
.
println
();
writer
.
append
(
"}"
).
println
();
}
}
protected
void
writeApiClass
(
Element
apiClass
)
throws
IOException
{
TraCiApiWrapper
traCIApi
=
new
TraCiApiWrapper
(
apiClass
);
JavaFileObject
jFile
=
processingEnv
.
getFiler
().
createSourceFile
(
traCIApi
.
name
);
apiMembers
.
append
(
String
.
format
(
"\tprotected %s.%s %s;\n"
,
traCIApi
.
packageName
,
traCIApi
.
name
,
traCIApi
.
name
.
toLowerCase
()));
apiInit
.
append
(
String
.
format
(
"\t\t%s = new %s.%s(socket);\n"
,
traCIApi
.
name
.
toLowerCase
(),
traCIApi
.
packageName
,
traCIApi
.
name
));
try
(
PrintWriter
writer
=
new
PrintWriter
(
jFile
.
openWriter
())){
writer
.
append
(
"package "
).
append
(
traCIApi
.
packageName
).
append
(
";"
).
println
();
writer
.
println
();
for
(
String
anImport
:
traCIApi
.
imports
)
{
writer
.
append
(
"import "
).
append
(
anImport
).
append
(
";"
).
println
();
}
writer
.
append
(
"import "
).
append
(
traCIApi
.
cmdEnum
).
append
(
";"
).
println
();
writer
.
append
(
"import "
).
append
(
traCIApi
.
varEnum
).
append
(
";"
).
println
();
writer
.
println
();
// start API class
writer
.
append
(
"public class "
).
append
(
traCIApi
.
name
).
append
(
" extends "
)
.
append
(
traCIApi
.
extendedClassName
).
append
(
" {"
).
println
();
// constructor
writer
.
append
(
"\tpublic "
).
append
(
traCIApi
.
name
).
append
(
"(TraCISocket socket) {"
).
println
();
writer
.
append
(
"\t\tsuper(socket, \""
).
append
(
traCIApi
.
name
).
append
(
"\");"
).
println
();
writer
.
append
(
"\t}"
).
println
();
writer
.
println
();
for
(
Element
element
:
apiClass
.
getEnclosedElements
())
{
List
<?
extends
AnnotationMirror
>
anMirrors
=
element
.
getAnnotationMirrors
();
if
(
anMirrors
!=
null
){
for
(
AnnotationMirror
anMirror
:
anMirrors
)
{
String
anName
=
anMirror
.
getAnnotationType
().
asElement
().
getSimpleName
().
toString
();
String
singeAn
=
traCIApi
.
singleAnnotation
.
substring
(
traCIApi
.
singleAnnotation
.
lastIndexOf
(
"."
)
+
1
).
trim
();
if
(
anName
.
equals
(
singeAn
)){
ApiHandler
apiHandler
=
new
ApiHandler
(
traCIApi
,
element
,
anMirror
);
apiMapping
.
append
(
String
.
format
(
"\t\tconsoleReader.addCommand(\"%s.%s\", \"\", this::%s_%s);\n"
,
traCIApi
.
name
.
toLowerCase
(),
apiHandler
.
name
,
traCIApi
.
name
.
toLowerCase
(),
apiHandler
.
name
));
apiAbstract
.
append
(
String
.
format
(
"\t\tabstract public void %s_%s (String args[]) throws IOException;\n"
,
traCIApi
.
name
.
toLowerCase
(),
apiHandler
.
name
));
switch
(
apiHandler
.
apiType
){
case
"GET"
:
writeGET
(
writer
,
apiHandler
);
break
;
case
"SET"
:
writeSET
(
writer
,
apiHandler
);
break
;
}
}
}
}
}
writer
.
append
(
"}"
).
println
();
// end API class
}
}
protected
void
writeGET
(
PrintWriter
writer
,
ApiHandler
apiHandler
){
if
(
apiHandler
.
ignoreElementId
){
writer
.
append
(
"\tpublic TraCIGetResponse "
).
append
(
apiHandler
.
name
).
append
(
"() throws IOException {"
).
println
();
writer
.
append
(
"\t\tTraCIPacket p = TraCIGetCommand.build("
).
append
(
apiHandler
.
cmd
).
append
(
", "
).
append
(
apiHandler
.
varId
).
append
(
", \"-1\");"
).
println
();
}
else
{
writer
.
append
(
"\tpublic TraCIGetResponse "
).
append
(
apiHandler
.
name
).
append
(
"(String elementID) throws IOException {"
).
println
();
writer
.
append
(
"\t\tTraCIPacket p = TraCIGetCommand.build("
).
append
(
apiHandler
.
cmd
).
append
(
", "
).
append
(
apiHandler
.
varId
).
append
(
", elementID);"
).
println
();
}
writer
.
append
(
"\n\t\tsocket.sendExact(p);\n"
).
println
();
writer
.
append
(
"\t\treturn (TraCIGetResponse) socket.receiveResponse();"
).
println
();
writer
.
append
(
"\t}"
).
println
();
writer
.
println
();
}
protected
void
writeSET
(
PrintWriter
writer
,
ApiHandler
apiHandler
){
writer
.
append
(
"\tpublic TraCIResponse "
).
append
(
apiHandler
.
name
).
append
(
"(String elementId, "
).
append
(
apiHandler
.
dataTypeStr
).
append
(
" data) throws IOException {"
).
println
();
writer
.
append
(
"\t\tTraCIPacket p = TraCISetCommand.build("
)
.
append
(
apiHandler
.
cmd
).
append
(
", elementId, "
).
append
(
apiHandler
.
varId
).
append
(
", "
).
append
(
apiHandler
.
varType
).
append
(
", data);"
).
println
();
writer
.
append
(
"\n\t\tsocket.sendExact(p);\n"
).
println
();
writer
.
append
(
"\t\treturn socket.receiveResponse();"
).
println
();
writer
.
append
(
"\t}"
).
println
();
writer
.
println
();
}
class
TraCiApiWrapper
{
String
name
;
String
singleAnnotation
;
String
multipleAnnotation
;
String
cmdEnum
;
String
varEnum
;
String
packageName
;
String
[]
imports
;
String
extendedClassName
;
TraCiApiWrapper
(
Element
apiClass
){
TraCIApi
traCIApi
=
apiClass
.
getAnnotation
(
TraCIApi
.
class
);
name
=
traCIApi
.
name
();
packageName
=
traCIApi
.
packageName
();
imports
=
traCIApi
.
imports
();
extendedClassName
=
traCIApi
.
extendedClassName
();
try
{
singleAnnotation
=
traCIApi
.
singleAnnotation
().
getCanonicalName
();
}
catch
(
MirroredTypeException
e
){
singleAnnotation
=
e
.
getTypeMirror
().
toString
();
}
try
{
multipleAnnotation
=
traCIApi
.
multipleAnnotation
().
getCanonicalName
();
}
catch
(
MirroredTypeException
e
){
multipleAnnotation
=
e
.
getTypeMirror
().
toString
();
}
try
{
cmdEnum
=
traCIApi
.
cmdEnum
().
getCanonicalName
();
}
catch
(
MirroredTypeException
e
){
cmdEnum
=
e
.
getTypeMirror
().
toString
();
}
try
{
varEnum
=
traCIApi
.
varEnum
().
getCanonicalName
();
}
catch
(
MirroredTypeException
e
){
varEnum
=
e
.
getTypeMirror
().
toString
();
}
}
}
class
ApiHandler
{
String
cmd
;
String
varId
;
String
varType
;
String
name
;
String
dataTypeStr
;
boolean
ignoreElementId
;
String
apiType
;
//SET, GET, SUB
public
ApiHandler
(
TraCiApiWrapper
traCIApi
,
Element
method
,
AnnotationMirror
annotationMirror
){
ignoreElementId
=
false
;
//default
dataTypeStr
=
""
;
String
cmdPrefix
=
traCIApi
.
cmdEnum
;
cmdPrefix
=
cmdPrefix
.
substring
(
cmdPrefix
.
lastIndexOf
(
'.'
)
+
1
).
trim
();
String
varPrefix
=
traCIApi
.
varEnum
;
varPrefix
=
varPrefix
.
substring
(
varPrefix
.
lastIndexOf
(
'.'
)
+
1
).
trim
();
Map
<?
extends
ExecutableElement
,
?
extends
AnnotationValue
>
valueMap
=
annotationMirror
.
getElementValues
();
for
(
Map
.
Entry
<?
extends
ExecutableElement
,
?
extends
AnnotationValue
>
entry
:
valueMap
.
entrySet
())
{
String
key
=
entry
.
getKey
().
getSimpleName
().
toString
();
Object
value
=
entry
.
getValue
().
getValue
();
switch
(
key
){
case
"cmd"
:
this
.
cmd
=
cmdPrefix
+
"."
+
value
.
toString
();
this
.
apiType
=
value
.
toString
().
substring
(
0
,
3
);
break
;
case
"var"
:
this
.
varId
=
varPrefix
+
"."
+
value
.
toString
()
+
".id"
;
this
.
varType
=
varPrefix
+
"."
+
value
.
toString
()
+
".type"
;
break
;
case
"name"
:
this
.
name
=
(
String
)
value
;
break
;
case
"ignoreElementId"
:
this
.
ignoreElementId
=
(
boolean
)
value
;
break
;
case
"dataTypeStr"
:
this
.
dataTypeStr
=
value
.
toString
();
}
}
}
@Override
public
String
toString
()
{
return
"ApiHandler{"
+
"cmd='"
+
cmd
+
'\''
+
", varId='"
+
varId
+
'\''
+
", varType='"
+
varType
+
'\''
+
", name='"
+
name
+
'\''
+
", ignoreElementId="
+
ignoreElementId
+
", apiType='"
+
apiType
+
'\''
+
'}'
;
}
}
}
VadereAnnotation/src/org/vadere/annotation/traci/client/TraCIApi.java
0 → 100644
View file @
4807a7a0
package
org.vadere.annotation.traci.client
;
import
java.lang.annotation.ElementType
;
import
java.lang.annotation.Retention
;
import
java.lang.annotation.RetentionPolicy
;
import
java.lang.annotation.Target
;
@Target
(
ElementType
.
TYPE
)
@Retention
(
RetentionPolicy
.
SOURCE
)
public
@interface
TraCIApi
{
String
packageName
()
default
"org.vadere.manager.client.traci"
;
String
[]
imports
()
default
{
"org.vadere.manager.client.traci.TraCIClientApi"
,
"org.vadere.manager.TraCISocket"
,
"org.vadere.manager.traci.commands.TraCIGetCommand"
,
"org.vadere.manager.traci.commands.TraCISetCommand"
,
"org.vadere.manager.traci.respons.TraCIGetResponse"
,
"org.vadere.manager.traci.writer.TraCIPacket"
,
"org.vadere.manager.traci.respons.TraCIResponse"
,
"java.io.IOException"
,
"java.util.ArrayList"
};
String
extendedClassName
()
default
"TraCIClientApi"
;
String
name
();
Class
singleAnnotation
();
Class
multipleAnnotation
();
Class
cmdEnum
();
Class
varEnum
();
}
VadereGui/src/org/vadere/gui/components/view/ScenarioElementView.java
View file @
4807a7a0
...
...
@@ -81,7 +81,7 @@ public class ScenarioElementView extends JPanel implements ISelectScenarioElemen
Theme
syntaxTheme
=
Theme
.
load
(
in
);
syntaxTheme
.
apply
(
textAreaLocal
);
}
catch
(
IOException
e
)
{
logger
.
error
(
"could not load theme"
+
e
.
getMessage
());
logger
.
error
(
"could not load
FromFilesystem
theme"
+
e
.
getMessage
());
}
txtrTextfiletextarea
=
textAreaLocal
;
...
...
VadereGui/src/org/vadere/gui/projectview/control/ActionAbstractAddScenario.java
View file @
4807a7a0
...
...
@@ -47,7 +47,7 @@ public abstract class ActionAbstractAddScenario extends AbstractAction {
return
;
addScenario
(
vadere
);
}
catch
(
IOException
e
)
{
logger
.
error
(
String
.
format
(
"topographyError during output load: '%s'"
,
e
.
getLocalizedMessage
()));
logger
.
error
(
String
.
format
(
"topographyError during output load
FromFilesystem
: '%s'"
,
e
.
getLocalizedMessage
()));
}
}
else
{
IOUtils
.
errorBox
(
Messages
.
getString
(
"renameErrorDialog.text"
),
...
...
VadereGui/src/org/vadere/gui/projectview/control/ActionCreateProject.java
View file @
4807a7a0
...
...
@@ -4,15 +4,19 @@ package org.vadere.gui.projectview.control;
import
org.vadere.gui.components.utils.Messages
;
import
org.vadere.gui.projectview.model.ProjectViewModel
;
import
org.vadere.gui.projectview.view.ProjectView
;
import
org.vadere.gui.projectview.view.VDialogManager
;
import
org.vadere.simulator.projects.VadereProject
;
import
org.vadere.util.logging.Logger
;
import
java.awt.event.ActionEvent
;
import
java.io.IOException
;
import
java.nio.file.Paths
;
import
java.util.ArrayList
;
import
javax.swing.*
;
import
static
org
.
vadere
.
gui
.
projectview
.
control
.
ActionAbstractSaveProject
.
saveProjectUnlessUserCancels
;
public
class
ActionCreateProject
extends
AbstractAction
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
@@ -40,10 +44,16 @@ public class ActionCreateProject extends AbstractAction {
if
(
newProjectName
==
null
||
newProjectName
.
trim
().
length
()
==
0
)
{
logger
.
info
(
"invalid project name"
);
}
else
{
VadereProject
project
=
new
VadereProject
(
newProjectName
,
new
ArrayList
<>());
model
.
setCurrentProjectPath
(
null
);
final
String
projectDirectory
=
VDialogManager
.
saveProjectDialog
();
if
(
projectDirectory
==
null
)
return
;
// do not create project without saving it first.
VadereProject
project
=
new
VadereProject
(
newProjectName
,
new
ArrayList
<>(),
Paths
.
get
(
projectDirectory
));
model
.
setProject
(
project
);
model
.
refreshOutputTable
();
saveProjectUnlessUserCancels
(
model
);
ProjectView
.
getMainWindow
().
setProjectSpecificActionsEnabled
(
true
);
logger
.
info
(
"create project: "
+
newProjectName
);
}
...
...
VadereGui/src/org/vadere/gui/projectview/control/ActionLoadProject.java