Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
vadere
vadere
Commits
e1e66f27
Commit
e1e66f27
authored
Jun 29, 2018
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue Fix:
#88
parent
eee5b7a3
Pipeline
#59264
passed with stage
in 48 seconds
Changes
22
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
50 additions
and
30 deletions
+50
-30
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
...odelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
...ModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm2.scenario
...ModelTests/TestOSM/scenarios/basic_4_2_wall_osm2.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_osm1.scenario
...delTests/TestOSM/scenarios/rimea_01_pathway_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_osm2.scenario
...delTests/TestOSM/scenarios/rimea_01_pathway_osm2.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_02_stairs_osm1.scenario
...odelTests/TestOSM/scenarios/rimea_02_stairs_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_03_stairs_osm1.scenario
...odelTests/TestOSM/scenarios/rimea_03_stairs_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_06_corner_osm1.scenario
...odelTests/TestOSM/scenarios/rimea_06_corner_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_06_corner_osm2.scenario
...odelTests/TestOSM/scenarios/rimea_06_corner_osm2.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_osm1.scenario
...odelTests/TestOSM/scenarios/rimea_07_speeds_osm1.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding_osm1.scenario
...ests/TestOSM/scenarios/rimea_10_pathfinding_osm1.scenario
+1
-1
VadereSimulator/src/org/vadere/simulator/control/Simulation.java
...imulator/src/org/vadere/simulator/control/Simulation.java
+18
-6
VadereSimulator/src/org/vadere/simulator/projects/ScenarioRun.java
...ulator/src/org/vadere/simulator/projects/ScenarioRun.java
+12
-4
No files found.
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
View file @
e1e66f27
...
...
@@ -76,7 +76,7 @@
"finishTime" : 200.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
View file @
e1e66f27
...
...
@@ -78,7 +78,7 @@
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
View file @
e1e66f27
...
...
@@ -78,7 +78,7 @@
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
View file @
e1e66f27
...
...
@@ -78,7 +78,7 @@
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
View file @
e1e66f27
...
...
@@ -78,7 +78,7 @@
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
View file @
e1e66f27
...
...
@@ -78,7 +78,7 @@
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
View file @
e1e66f27
...
...
@@ -78,7 +78,7 @@
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm2.scenario
View file @
e1e66f27
...
...
@@ -78,7 +78,7 @@
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_osm1.scenario
View file @
e1e66f27
...
...
@@ -75,7 +75,7 @@
"finishTime" : 1300.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_osm2.scenario
View file @
e1e66f27
...
...
@@ -75,7 +75,7 @@
"finishTime" : 1300.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_02_stairs_osm1.scenario
View file @
e1e66f27
...
...
@@ -61,7 +61,7 @@
"finishTime" : 500.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_03_stairs_osm1.scenario
View file @
e1e66f27
...
...
@@ -61,7 +61,7 @@
"finishTime" : 500.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
View file @
e1e66f27
...
...
@@ -61,7 +61,7 @@
"finishTime" : 300.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
View file @
e1e66f27
...
...
@@ -61,7 +61,7 @@
"finishTime" : 300.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
View file @
e1e66f27
...
...
@@ -61,7 +61,7 @@
"finishTime" : 300.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
View file @
e1e66f27
...
...
@@ -61,7 +61,7 @@
"finishTime" : 300.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_06_corner_osm1.scenario
View file @
e1e66f27
...
...
@@ -92,7 +92,7 @@
"finishTime" : 100.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_06_corner_osm2.scenario
View file @
e1e66f27
...
...
@@ -95,7 +95,7 @@
"finishTime" : 100.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_osm1.scenario
View file @
e1e66f27
...
...
@@ -75,7 +75,7 @@
"finishTime" : 500.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding_osm1.scenario
View file @
e1e66f27
...
...
@@ -91,7 +91,7 @@
"finishTime" : 50.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
VadereSimulator/src/org/vadere/simulator/control/Simulation.java
View file @
e1e66f27
...
...
@@ -140,7 +140,9 @@ public class Simulation {
c
.
preLoop
(
simTimeInSec
);
}
processorManager
.
preLoop
(
this
.
simulationState
);
if
(
attributesSimulation
.
isWriteSimulationData
())
{
processorManager
.
preLoop
(
this
.
simulationState
);
}
}
private
void
postLoop
()
{
...
...
@@ -154,7 +156,9 @@ public class Simulation {
c
.
postLoop
(
simTimeInSec
);
}
processorManager
.
postLoop
(
this
.
simulationState
);
if
(
attributesSimulation
.
isWriteSimulationData
())
{
processorManager
.
postLoop
(
this
.
simulationState
);
}
topographyController
.
postLoop
(
this
.
simTimeInSec
);
}
...
...
@@ -163,8 +167,10 @@ public class Simulation {
*/
public
void
run
()
{
try
{
processorManager
.
setMainModel
(
mainModel
);
processorManager
.
initOutputFiles
();
if
(
attributesSimulation
.
isWriteSimulationData
())
{
processorManager
.
setMainModel
(
mainModel
);
processorManager
.
initOutputFiles
();
}
preLoop
();
...
...
@@ -192,7 +198,11 @@ public class Simulation {
assert
assertAllPedestrianInBounds
();
updateCallbacks
(
simTimeInSec
);
updateWriters
(
simTimeInSec
);
processorManager
.
update
(
this
.
simulationState
);
if
(
attributesSimulation
.
isWriteSimulationData
())
{
processorManager
.
update
(
this
.
simulationState
);
}
for
(
PassiveCallback
c
:
passiveCallbacks
)
{
c
.
postUpdate
(
simTimeInSec
);
...
...
@@ -219,7 +229,9 @@ public class Simulation {
// this is necessary to free the resources (files), the SimulationWriter and processor are writing in!
postLoop
();
processorManager
.
writeOutput
();
if
(
attributesSimulation
.
isWriteSimulationData
())
{
processorManager
.
writeOutput
();
}
logger
.
info
(
"Finished writing all output files"
);
}
}
...
...
VadereSimulator/src/org/vadere/simulator/projects/ScenarioRun.java
View file @
e1e66f27
...
...
@@ -13,6 +13,7 @@ import java.util.Random;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.jetbrains.annotations.Nullable
;
import
org.vadere.simulator.control.PassiveCallback
;
import
org.vadere.simulator.control.Simulation
;
import
org.vadere.simulator.models.MainModel
;
...
...
@@ -38,7 +39,9 @@ public class ScenarioRun implements Runnable {
private
final
DataProcessingJsonManager
dataProcessingJsonManager
;
private
Simulation
simulation
;
private
ProcessorManager
processorManager
;
// the processor is null if no output is written i.e. if scenarioStore.attributesSimulation.isWriteSimulationData() is false.
private
@Nullable
ProcessorManager
processorManager
;
private
final
Scenario
scenario
;
private
final
ScenarioStore
scenarioStore
;
// contained in scenario, but here for convenience
...
...
@@ -76,10 +79,12 @@ public class ScenarioRun implements Runnable {
final
Random
random
=
modelBuilder
.
getRandom
();
// prepare processors and simulation data writer
processorManager
=
dataProcessingJsonManager
.
createProcessorManager
(
mainModel
);
if
(
scenarioStore
.
attributesSimulation
.
isWriteSimulationData
())
{
processorManager
=
dataProcessingJsonManager
.
createProcessorManager
(
mainModel
);
}
// Only create output directory and write .scenario file if there is any output.
if
(!
processorManager
.
isEmpty
())
{
if
(
processorManager
!=
null
&&
!
processorManager
.
isEmpty
())
{
createAndSetOutputDirectory
();
scenario
.
saveToOutputPath
(
outputPath
);
}
...
...
@@ -166,7 +171,10 @@ public class ScenarioRun implements Runnable {
private
void
sealAllAttributes
()
{
scenarioStore
.
sealAllAttributes
();
processorManager
.
sealAllAttributes
();
if
(
processorManager
!=
null
)
{
processorManager
.
sealAllAttributes
();
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment