Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

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
{ {
"name" : "thick_wall_pso_ok", "name" : "thick_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",
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,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",
...@@ -148,7 +142,16 @@ ...@@ -148,7 +142,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" : "thin_wall_and_closer_source_discrete_could_fail", "name" : "thin_wall_and_closer_source_discrete_could_fail",
"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",
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,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",
...@@ -148,7 +142,16 @@ ...@@ -148,7 +142,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" : "thin_wall_and_closer_source_nelder_mead_ok", "name" : "thin_wall_and_closer_source_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",
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,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",
...@@ -148,7 +142,16 @@ ...@@ -148,7 +142,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" : "thin_wall_and_closer_source_pso_could_fail", "name" : "thin_wall_and_closer_source_pso_could_fail",
"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",
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,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",
...@@ -148,7 +142,16 @@ ...@@ -148,7 +142,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" : "thin_wall_discrete_ok", "name" : "thin_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",
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,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" : 11.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...@@ -148,7 +142,16 @@ ...@@ -148,7 +142,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 11.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "thin_wall_nelder_mead_ok", "name" : "thin_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",
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,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" : 11.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...@@ -148,7 +142,16 @@ ...@@ -148,7 +142,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 11.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "thin_wall_pso_ok", "name" : "thin_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",
...@@ -21,13 +21,7 @@ ...@@ -21,13 +21,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" : 11.0,
"height" : 10.0,
"type" : "RECTANGLE"
}
} }
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
...@@ -148,7 +142,16 @@ ...@@ -148,7 +142,16 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ], "measurementAreas" : [ {
"shape" : {
"x" : 9.0,
"y" : 0.0,
"width" : 11.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "group_OSM_1Source1Place", "name" : "group_OSM_1Source1Place",
"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",
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
"bounded" : true "bounded" : true
}, },
"obstacles" : [ ], "obstacles" : [ ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "group_OSM_1Source1Place_noGroup", "name" : "group_OSM_1Source1Place_noGroup",
"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",
...@@ -94,6 +94,7 @@ ...@@ -94,6 +94,7 @@
"bounded" : true "bounded" : true
}, },
"obstacles" : [ ], "obstacles" : [ ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "group_OSM_1Source2Places", "name" : "group_OSM_1Source2Places",
"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",
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "group_OSM_1Source2Places_noGroups", "name" : "group_OSM_1Source2Places_noGroups",
"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",
...@@ -148,6 +148,7 @@ ...@@ -148,6 +148,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
...@@ -239,4 +240,4 @@ ...@@ -239,4 +240,4 @@
}, },
"eventInfos" : [ ] "eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "group_OSM_2Sources1Place", "name" : "group_OSM_2Sources1Place",
"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",
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "group_OSM_2Sources1Place_2Group_and_3Group", "name" : "group_OSM_2Sources1Place_2Group_and_3Group",
"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",
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
......
{ {
"name" : "basic_5_1_roadReachTarget_ovm1", "name" : "basic_5_1_roadReachTarget_ovm1",
"description" : "", "description" : "",
"release" : "0.7", "release" : "0.8",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
"isTimestamped" : true "isTimestamped" : true,
"isWriteMetaData" : false
}, },
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel", "mainModel" : "org.vadere.simulator.models.ovm.OptimalVelocityModel",
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
"bounded" : true "bounded" : true
}, },
"obstacles" : [ ], "obstacles" : [ ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
...@@ -88,6 +89,7 @@ ...@@ -88,6 +89,7 @@
"startingWithRedLight" : false, "startingWithRedLight" : false,
"nextSpeed" : -1.0 "nextSpeed" : -1.0
} ], } ],
"absorbingAreas" : [ ],
"sources" : [ { "sources" : [ {
"id" : -1, "id" : -1,
"shape" : { "shape" : {
...@@ -109,6 +111,7 @@ ...@@ -109,6 +111,7 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "CAR" "dynamicElementType" : "CAR"
} ],