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 d443bdc1 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

fix sceanrios and increase timeout

parent 21ad9c1d
Pipeline #76267 canceled with stages
......@@ -2,7 +2,6 @@
"name" : "bridge_timeCost_NAVIGATION",
"description" : "",
"release" : "0.6",
"commithash" : "7083c1b72bc0488b47da0d0116a94f58ff462db7",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......
{
"name" : "bridge_timeCost_QUEUEING_GAME",
"description" : "",
"release" : "0.6",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"processors" : [ 3 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt",
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 4,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
"varyStepDirection" : false,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
"pedPotentialPersonalSpaceWidth" : 1.2,
"pedPotentialHeight" : 50.0,
"obstPotentialWidth" : 0.8,
"obstPotentialHeight" : 6.0,
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "QUEUEING_GAME",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
}
},
"attributesSimulation" : {
"finishTime" : 120.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -3213925745664992646,
"simulationSeed" : 0
},
"topography" : {
"attributes" : {
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" : 50.0,
"height" : 50.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
},
"obstacles" : [ {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 50.295924079138786,
"y" : 42.50668004900217
}, {
"x" : 31.295924079138786,
"y" : 42.50668004900217
}, {
"x" : 20.931872089859098,
"y" : 10.544835465960205
}, {
"x" : 32.12912071251776,
"y" : 5.936819093301892
}, {
"x" : 50.12912071251776,
"y" : 5.936819093301892
} ]
},
"id" : 1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 29.94311923184432,
"y" : -1.52171147800982
}, {
"x" : 29.94311923184432,
"y" : 0.47828852199018
}, {
"x" : 7.711477719247341,
"y" : 10.030658625997603
}, {
"x" : 0.32635102153290063,
"y" : 11.349890053272247
}, {
"x" : 0.32635102153290063,
"y" : -0.6501099467277527
} ]
},
"id" : 2
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 3.88868360244669,
"y" : 20.25141224823892
}, {
"x" : 10.068316678749397,
"y" : 15.240937641821802
}, {
"x" : 15.45937814656645,
"y" : 12.808810473419726
}, {
"x" : 23.463889407925308,
"y" : 45.90773453190923
}, {
"x" : 0.46388940792530775,
"y" : 45.90773453190923
} ]
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 0.30000000004656613,
"y" : 11.299999999813735
}, {
"x" : 0.09999999997671694,
"y" : 12.700000000186265
}, {
"x" : 0.5,
"y" : 23.200000000186265
}, {
"x" : 3.900000000023283,
"y" : 20.200000000186265
} ]
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
}, {
"id" : 1,
"absorbing" : true,
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 33.90000000002328,
"y" : 0.20000000018626451
}, {
"x" : 29.900000000023283,
"y" : 0.5
}, {
"x" : 32.300000000046566,
"y" : 6.0
}, {
"x" : 36.40000000002328,
"y" : 4.900000000372529
} ]
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 24.300000000046566,
"y" : 44.5,
"width" : 8.0,
"height" : 4.4,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 4,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 30.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
}
}
}
\ No newline at end of file
......@@ -86,7 +86,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 150.0,
"finishTime" : 90.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
......@@ -338,7 +338,7 @@
"spawnNumber" : 3,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 35.0,
"endTime" : 15.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : true,
"targetIds" : [ 8 ],
......@@ -358,7 +358,7 @@
"spawnNumber" : 3,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 35.0,
"endTime" : 15.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : true,
"targetIds" : [ 15, 8 ],
......@@ -378,7 +378,7 @@
"spawnNumber" : 3,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 35.0,
"endTime" : 15.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : true,
"targetIds" : [ 6, 7 ],
......@@ -398,7 +398,7 @@
"spawnNumber" : 3,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 35.0,
"endTime" : 15.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : true,
"targetIds" : [ 6, 7 ],
......
{
"name" : "bridge_timeCost_NAVIGATION_GAME",
"name" : "complex_NAVIGATION_groups_001",
"description" : "",
"release" : "0.6",
"processWriters" : {
......@@ -41,21 +41,21 @@
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
"varyStepDirection" : false,
"varyStepDirection" : true,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "NELDER_MEAD",
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"dynamicStepLength" : true,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
"submodels" : [ "org.vadere.simulator.models.groups.CentroidGroupModel" ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
......@@ -74,7 +74,7 @@
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "NAVIGATION_GAME",
"type" : "NAVIGATION",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
......@@ -83,10 +83,14 @@
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesCGM" : {
"groupMemberRepulsionFactor" : 0.01,
"leaderAttractionFactor" : 0.003
}
},
"attributesSimulation" : {
"finishTime" : 120.0,
"finishTime" : 45.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
......@@ -112,86 +116,159 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 50.295924079138786,
"y" : 42.50668004900217
"x" : 0.4,
"y" : 0.4
}, {
"x" : 0.5,
"y" : 18.7
}, {
"x" : 9.8,
"y" : 18.8
}, {
"x" : 15.4,
"y" : 8.3
}, {
"x" : 15.4,
"y" : 0.5
} ]
},
"id" : 9
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 0.6,
"y" : 34.9
}, {
"x" : 31.295924079138786,
"y" : 42.50668004900217
"x" : 0.4,
"y" : 49.5
}, {
"x" : 20.931872089859098,
"y" : 10.544835465960205
"x" : 14.9,
"y" : 49.5
}, {
"x" : 32.12912071251776,
"y" : 5.936819093301892
"x" : 14.7,
"y" : 42.3
}, {
"x" : 50.12912071251776,
"y" : 5.936819093301892
"x" : 9.0,
"y" : 35.0
} ]
},
"id" : 1
"id" : 10
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 29.94311923184432,
"y" : -1.52171147800982
"x" : 36.0,
"y" : 25.7
}, {
"x" : 12.4,
"y" : 25.8
}, {
"x" : 29.94311923184432,
"y" : 0.47828852199018
"x" : 12.5,
"y" : 29.5
}, {
"x" : 7.711477719247341,
"y" : 10.030658625997603
"x" : 20.7,
"y" : 39.6
}, {
"x" : 0.32635102153290063,
"y" : 11.349890053272247
"x" : 32.0,
"y" : 39.5
}, {
"x" : 0.32635102153290063,
"y" : -0.6501099467277527
"x" : 36.1,
"y" : 32.7
} ]
},
"id" : 2
"id" : 11
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 3.88868360244669,
"y" : 20.25141224823892
"x" : 19.8,
"y" : 22.1
}, {
"x" : 10.068316678749397,
"y" : 15.240937641821802
"x" : 32.3,
"y" : 22.2
}, {
"x" : 15.45937814656645,
"y" : 12.808810473419726
"x" : 33.24321348467342,
"y" : 18.125317746210836
}, {
"x" : 23.463889407925308,
"y" : 45.90773453190923
"x" : 43.4,
"y" : 18.2
}, {
"x" : 0.46388940792530775,
"y" : 45.90773453190923
"x" : 43.5,
"y" : 3.9
}, {
"x" : 35.9,
"y" : 3.9
}, {
"x" : 29.8,
"y" : 11.3
}, {
"x" : 29.800000000000008,
"y" : 11.311504424778763
}, {
"x" : 19.8,
"y" : 11.4
} ]
},
"id" : -1
"id" : 12
}, {
"shape" : {
"x" : 35.5,
"y" : 39.3,
"width" : 14.3,
"height" : 10.2,
"type" : "RECTANGLE"
},
"id" : 5
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"stairs" : [ {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 0.30000000004656613,
"y" : 11.299999999813735
"x" : 13.0,
"y" : 29.8
}, {
"x" : 0.09999999997671694,
"y" : 12.700000000186265
"x" : 7.9,
"y" : 33.7
}, {
"x" : 0.5,
"y" : 23.200000000186265
"x" : 14.8,
"y" : 42.1
}, {
"x" : 3.900000000023283,
"y" : 20.200000000186265
"x" : 20.3,
"y" : 38.8
} ]
},
"id" : 20,
"treadCount" : 35,
"upwardDirection" : {
"x" : 1.0,
"y" : 1.3
}
}, {
"shape" : {
"x" : 43.1,
"y" : 3.9,
"width" : 6.4,
"height" : 14.4,
"type" : "RECTANGLE"
},
"id" : 14,
"treadCount" : 45,
"upwardDirection" : {
"x" : 0.0,
"y" : 1.0
}
} ],
"targets" : [ {
"id" : 6,
"absorbing" : false,
"shape" : {
"x" : 41.6,
"y" : 20.0,
"width" : 3.7,
"height" : 10.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,