Skip to content

GitLab

Commit 6c627813 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Merge branch 'measurementAreaRefactorProcessors_rebased' into 'master' 

Measurement area refactor processors rebased

See merge request !55
parents dcffc7d3 83cb5e48
Pipeline #103785 passed with stages
in 137 minutes and 9 seconds
Show whitespace changes
Inline Side-by-side
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_025_up",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_050_d",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_050_h",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -88,13 +88,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
"attributes" : {
"pedestrianTrajectoryProcessorId" : 10,
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
"measurementAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
......@@ -115,13 +109,7 @@
"id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -129,20 +117,8 @@
"id" : 12,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"voronoiArea" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -232,7 +208,25 @@
"bounded" : true
},
"obstacles" : [ ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 1
}, {
"shape" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_050_up",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_075_d",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_075_h",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -88,13 +88,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
"attributes" : {
"pedestrianTrajectoryProcessorId" : 10,
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
"measurementAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
......@@ -115,13 +109,7 @@
"id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -129,20 +117,8 @@
"id" : 12,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"voronoiArea" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -232,7 +208,25 @@
"bounded" : true
},
"obstacles" : [ ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 1
}, {
"shape" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_075_up",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_100_d",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_100_h",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -88,13 +88,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
"attributes" : {
"pedestrianTrajectoryProcessorId" : 10,
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
"measurementAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
......@@ -115,13 +109,7 @@
"id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -129,20 +117,8 @@
"id" : 12,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"voronoiArea" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -232,7 +208,25 @@
"bounded" : true
},
"obstacles" : [ ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 1
}, {
"shape" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_100_up",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_125_d",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_125_h",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -88,13 +88,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
"attributes" : {
"pedestrianTrajectoryProcessorId" : 10,
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
"measurementAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
......@@ -115,13 +109,7 @@
"id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -129,20 +117,8 @@
"id" : 12,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"voronoiArea" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -232,7 +208,25 @@
"bounded" : true
},
"obstacles" : [ ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 1
}, {
"shape" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_125_up",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_470_h",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -88,13 +88,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
"attributes" : {
"pedestrianTrajectoryProcessorId" : 10,
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
"measurementAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
......@@ -115,13 +109,7 @@
"id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -129,20 +117,8 @@
"id" : 12,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
"attributes" : {
"measurementArea" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"voronoiArea" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"measurementAreaId" : 1,
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 7
}
}, {
......@@ -232,7 +208,25 @@
"bounded" : true
},
"obstacles" : [ ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 1
}, {
"shape" : {
"x" : 17.0,
"y" : 10.1,
"width" : 12.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
......
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
View file @ 6c627813
{
"name" : "rimea_04_flow_osm1_550_up",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario
View file @ 6c627813
{
"name" : "rimea_05_react",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......
VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
View file @ 6c627813
{
"name" : "rimea_06_corner",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -25,13 +25,7 @@
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingArea" : {
"x" : 1.0,
"y" : 3.0,
"width" : 9.5,
"height" : 10.5,
"type" : "RECTANGLE"
}
"waitingAreaId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor",
......@@ -171,7 +165,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"measurementAreas" : [ {
"shape" : {
"x" : 1.0,
"y" : 3.0,
"width" : 9.5,
"height" : 10.5,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
......
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario
View file @ 6c627813
{
"name" : "rimea_07_speeds_discrete_ca",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario
View file @ 6c627813
{
"name" : "rimea_07_speeds_nelder_mead",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario
View file @ 6c627813
{
"name" : "rimea_07_speeds_pso",
"description" : "",
"release" : "0.7",
"release" : "0.8",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......