Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
ccbc2610
Commit
ccbc2610
authored
Oct 16, 2019
by
Benedikt Kleinmeier
Browse files
Merge branch 'master' of gitlab.lrz.de:vadere/vadere
parents
01691816
090ff3d5
Pipeline
#164889
passed with stages
in 148 minutes and 7 seconds
Changes
44
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
ccbc2610
...
...
@@ -7,7 +7,8 @@
### Added
### Changed
-
`PedestrianFootStepProcessor`
interpolates the pedestrian's foot step to obtain a more precise position.
-
`FootStepProcessor`
interpolates the pedestrian's foot step to obtain a more precise position.
Was previously known as
`PedestrianFootStepProcessor`
# v1.4 (2019-09-05)
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -49,7 +49,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -138,6 +138,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
View file @
ccbc2610
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2
, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5
,
1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",