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 b71c6533 authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

Merge branch 'master' into...

Merge branch 'master' into 241-new-flag-to-compute-metric-for-the-quality-of-the-stepcircleoptimizer

# Conflicts:
#	VadereUtils/src/org/vadere/util/config/VadereConfig.java
parents 4a8f17e3 25bcc7b9
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_09_public_room_4_exits_pso", "name" : "rimea_09_public_room_4_exits_pso",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -85,7 +84,9 @@ ...@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_10_pathfinding", "name" : "rimea_10_pathfinding",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -81,7 +80,9 @@ ...@@ -81,7 +80,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_11_exit_selection_nelder_mead", "name" : "rimea_11_exit_selection_nelder_mead",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -43,7 +42,9 @@ ...@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_11_exit_selection_pso", "name" : "rimea_11_exit_selection_pso",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -43,7 +42,9 @@ ...@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_12_evacuation_nelder_mead", "name" : "rimea_12_evacuation_nelder_mead",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -43,7 +42,9 @@ ...@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_12_evacuation_pso", "name" : "rimea_12_evacuation_pso",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ { "processors" : [ {
...@@ -43,7 +42,9 @@ ...@@ -43,7 +42,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_13_stairs_long_nelder_mead", "name" : "rimea_13_stairs_long_nelder_mead",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -50,7 +49,9 @@ ...@@ -50,7 +49,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_13_stairs_long_pso", "name" : "rimea_13_stairs_long_pso",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -50,7 +49,9 @@ ...@@ -50,7 +49,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_13_stairs_nelder_mead", "name" : "rimea_13_stairs_nelder_mead",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -50,7 +49,9 @@ ...@@ -50,7 +49,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_13_stairs_pso", "name" : "rimea_13_stairs_pso",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -50,7 +49,9 @@ ...@@ -50,7 +49,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_14_select_route_nelder_mead", "name" : "rimea_14_select_route_nelder_mead",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -50,7 +49,9 @@ ...@@ -50,7 +49,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_14_select_route_pso", "name" : "rimea_14_select_route_pso",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -50,7 +49,9 @@ ...@@ -50,7 +49,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "see_small_wall_nelder_mead_ok", "name" : "see_small_wall_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "see_small_wall_pso_fail", "name" : "see_small_wall_pso_fail",
"description" : "The particle swarm optimizer does not use the attribute seeSmallWalls.", "description" : "The particle swarm optimizer does not use the attribute seeSmallWalls.",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "thick_wall_discrete_ok", "name" : "thick_wall_discrete_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "thick_wall_nelder_mead_ok", "name" : "thick_wall_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "thick_wall_pso_ok", "name" : "thick_wall_pso_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "thin_wall_and_closer_source_discrete_could_fail", "name" : "thin_wall_and_closer_source_discrete_could_fail",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "thin_wall_and_closer_source_nelder_mead_ok", "name" : "thin_wall_and_closer_source_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "thin_wall_and_closer_source_pso_could_fail", "name" : "thin_wall_and_closer_source_pso_could_fail",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -75,7 +74,9 @@ ...@@ -75,7 +74,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment