Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
We have upgraded GitLab to 15.1. Due to major code changes GitLab was down for some time.
Open sidebar
vadere
vadere
Commits
2e23dafa
Commit
2e23dafa
authored
Jun 29, 2018
by
Daniel Lehmberg
Browse files
Merge branch 'develop' of gitlab.lrz.de:vadere/vadere into develop
parents
2a856b01
e1e66f27
Pipeline
#59266
failed with stage
in 23 seconds
Changes
39
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
VadereGui/src/org/vadere/gui/onlinevisualization/OnlineVisualization.java
View file @
2e23dafa
...
...
@@ -36,7 +36,7 @@ public class OnlineVisualization implements PassiveCallback {
private
OnlineVisualisationWindow
onlineVisualisationPanel
;
private
OnlineVisualizationModel
model
;
private
Topography
scenario
;
private
IPotentialFieldTarget
potentialFieldTarget
;
private
@Nullable
IPotentialFieldTarget
potentialFieldTarget
;
private
boolean
enableVisualization
;
public
OnlineVisualization
(
boolean
enableVisualization
)
{
...
...
@@ -94,7 +94,7 @@ public class OnlineVisualization implements PassiveCallback {
new
ObservationAreaSnapshotData
(
simTimeInSec
,
scenario
.
clone
(),
model
.
config
.
isShowPotentialField
()
?
potentialFieldTarget
.
copyFields
()
:
null
));
(
model
.
config
.
isShowPotentialField
()
&&
potentialFieldTarget
!=
null
)
?
potentialFieldTarget
.
copyFields
()
:
null
));
}
}
...
...
VadereModelTests/TestOSM/scenarios/basic_1_chicken_osm1.scenario
View file @
2e23dafa
...
...
@@ -7,10 +7,27 @@
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTimes.txt",
"processors" : [ 2 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
...
...
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
View file @
2e23dafa
...
...
@@ -3,8 +3,23 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "density.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityCountingProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 2,
"radius" : 1.5
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 2
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,25 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,25 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,25 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,25 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,25 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,25 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,25 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,22 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "evacuationTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor",
"attributes" : {
"pedestrianStartTimeProcessorId" : 2
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
"id" : 2
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,22 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "evacuationTime.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor",
"attributes" : {
"pedestrianStartTimeProcessorId" : 2
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
"id" : 2
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -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 @
2e23dafa
...
...
@@ -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 @
2e23dafa
...
...
@@ -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 @
2e23dafa
...
...
@@ -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 @
2e23dafa
...
...
@@ -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 @
2e23dafa
...
...
@@ -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 @
2e23dafa
...
...
@@ -3,8 +3,39 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTimes.txt",
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "evacuationTimes.txt",
"processors" : [ 2 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 1.0,
"y" : 3.5,
"width" : 9.5,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor",
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor",
"attributes" : {
"pedestrianStartTimeProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 3
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,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 @
2e23dafa
...
...
@@ -3,8 +3,42 @@
"description" : "",
"release" : "0.2",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTimes.txt",
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "evacuationTimes.txt",
"processors" : [ 2 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 1.0,
"y" : 3.5,
"width" : 9.5,
"height" : 10.0,
"type" : "RECTANGLE"
}
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor",
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor",
"attributes" : {
"pedestrianStartTimeProcessorId" : 4
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
"id" : 4
} ],
"isTimestamped" : true
},
"scenario" : {
...
...
@@ -61,7 +95,7 @@
"finishTime" : 100.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" :
tru
e,
"writeSimulationData" :
fals
e,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
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