Commit 42ce721a authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Introduce json version v0.8

parent d2b3758a
{ {
"name" : "basic_2_density_pso", "name" : "basic_2_density_pso",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{ {
"name" : "chicken_floorfield_displaced_ok", "name" : "chicken_floorfield_displaced_ok",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -28,13 +28,7 @@ ...@@ -28,13 +28,7 @@
"id" : 2, "id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : { "attributes" : {
"waitingArea" : { "waitingAreaId" : 1
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
...@@ -160,7 +154,16 @@ ...@@ -160,7 +154,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "chicken_floorfield_ok", "name" : "chicken_floorfield_ok",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -28,13 +28,7 @@ ...@@ -28,13 +28,7 @@
"id" : 2, "id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : { "attributes" : {
"waitingArea" : { "waitingAreaId" : 1
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
...@@ -170,7 +164,16 @@ ...@@ -170,7 +164,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "corner_waiting_time_processor_test", "name" : "corner_waiting_time_processor_test",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -25,13 +25,7 @@ ...@@ -25,13 +25,7 @@
"id" : 1, "id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : { "attributes" : {
"waitingArea" : { "waitingAreaId" : 1
"x" : 1.0,
"y" : 3.5,
"width" : 9.5,
"height" : 10.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianEvacuationTimeProcessor",
...@@ -161,7 +155,16 @@ ...@@ -161,7 +155,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 1.0,
"y" : 3.5,
"width" : 9.5,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "narrow_passage_discrete_CA_fail", "name" : "narrow_passage_discrete_CA_fail",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{ {
"name" : "narrow_passage_nelder_mead_ok", "name" : "narrow_passage_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{ {
"name" : "narrow_passage_pso_ok", "name" : "narrow_passage_pso_ok",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{ {
"name" : "queueing_dynamic_floorfield_visual_check", "name" : "queueing_dynamic_floorfield_visual_check",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{ {
"name" : "regular_wall_discrete_ok", "name" : "regular_wall_discrete_ok",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -17,13 +17,7 @@ ...@@ -17,13 +17,7 @@
"id" : 1, "id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : { "attributes" : {
"waitingArea" : { "waitingAreaId" : 1
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...@@ -213,7 +207,16 @@ ...@@ -213,7 +207,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "regular_wall_nelder_mead_ok", "name" : "regular_wall_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -17,13 +17,7 @@ ...@@ -17,13 +17,7 @@
"id" : 1, "id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : { "attributes" : {
"waitingArea" : { "waitingAreaId" : 1
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...@@ -213,7 +207,16 @@ ...@@ -213,7 +207,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "regular_wall_pso_ok", "name" : "regular_wall_pso_ok",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -17,13 +17,7 @@ ...@@ -17,13 +17,7 @@
"id" : 1, "id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : { "attributes" : {
"waitingArea" : { "waitingAreaId" : 1
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...@@ -141,7 +135,16 @@ ...@@ -141,7 +135,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 7.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "rimea_01_pathway_discrete_brute_force", "name" : "rimea_01_pathway_discrete_brute_force",
"description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE", "description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......
{ {
"name" : "rimea_01_pathway_discrete_ca", "name" : "rimea_01_pathway_discrete_ca",
"description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......
{ {
"name" : "rimea_04_flow_osm1_025_d", "name" : "rimea_04_flow_osm1_025_d",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
......
{ {
"name" : "rimea_04_flow_osm1_025_up", "name" : "rimea_04_flow_osm1_025_up",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
......
{ {
"name" : "rimea_04_flow_osm1_050_d", "name" : "rimea_04_flow_osm1_050_d",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
......
{ {
"name" : "rimea_04_flow_osm1_050_h", "name" : "rimea_04_flow_osm1_050_h",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -88,13 +88,7 @@ ...@@ -88,13 +88,7 @@
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramBProcessor",
"attributes" : { "attributes" : {
"pedestrianTrajectoryProcessorId" : 10, "pedestrianTrajectoryProcessorId" : 10,
"measurementArea" : { "measurementAreaId" : 1
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
...@@ -115,13 +109,7 @@ ...@@ -115,13 +109,7 @@
"id" : 11, "id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : { "attributes" : {
"measurementArea" : { "measurementAreaId" : 1,
"x" : 22.0,
"y" : 10.1,
"width" : 2.0,
"height" : 1.8,
"type" : "RECTANGLE"
},
"pedestrianVelocityProcessorId" : 7 "pedestrianVelocityProcessorId" : 7
} }
}, { }, {
...@@ -129,20 +117,8 @@ ...@@ -129,20 +117,8 @@
"id" : 12, "id" : 12,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramDProcessor",
"attributes" : { "attributes" : {
"measurementArea" : { "measurementAreaId" : 1,
"x" : 22.0, "voronoiMeasurementAreaId" : 2,
"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"
},
"pedestrianVelocityProcessorId" : 7 "pedestrianVelocityProcessorId" : 7
} }
}, { }, {
...@@ -232,7 +208,25 @@ ...@@ -232,7 +208,25 @@
"bounded" : true "bounded" : true
}, },
"obstacles" : [ ], "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" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "rimea_04_flow_osm1_050_up", "name" : "rimea_04_flow_osm1_050_up",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
......
{ {
"name" : "rimea_04_flow_osm1_075_d", "name" : "rimea_04_flow_osm1_075_d",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ {