Commit 38f232da authored by Christina's avatar Christina
Browse files

extended supermarket

parent ede2f472
Pipeline #237997 failed with stages
in 3 minutes and 41 seconds
......@@ -93,7 +93,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 500.0,
"finishTime" : 10000.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" : true,
......@@ -159,42 +159,6 @@
} ]
},
"id" : 38
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 26.0,
"y" : 26.5
}, {
"x" : 26.0,
"y" : 31.5
}, {
"x" : 1.0,
"y" : 31.5
}, {
"x" : 0.7,
"y" : 1.0
}, {
"x" : 15.0,
"y" : 0.8
}, {
"x" : 15.0,
"y" : 4.9
}, {
"x" : 8.35526315789474,
"y" : 4.900000000000001
}, {
"x" : 8.355263157894738,
"y" : 9.889473684210525
}, {
"x" : 2.0,
"y" : 9.889473684210527
}, {
"x" : 2.0,
"y" : 26.4
} ]
},
"id" : 39
}, {
"shape" : {
"type" : "POLYGON",
......@@ -235,16 +199,16 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 40.9,
"x" : 42.9,
"y" : 15.8
}, {
"x" : 41.9,
"x" : 43.9,
"y" : 15.8
}, {
"x" : 41.9,
"x" : 43.9,
"y" : 24.3
}, {
"x" : 40.9,
"x" : 42.9,
"y" : 24.3
} ]
},
......@@ -253,74 +217,20 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 20.4,
"y" : 13.5
"x" : 45.9,
"y" : 23.5
}, {
"x" : 20.4,
"y" : 10.8
"x" : 45.9,
"y" : 22.4
}, {
"x" : 22.0,
"y" : 10.8
"x" : 48.5,
"y" : 22.4
}, {
"x" : 22.0,
"y" : 13.5
} ]
},
"id" : 43
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 46.0,
"y" : 24.3
}, {
"x" : 46.0,
"y" : 23.2
}, {
"x" : 48.6,
"y" : 23.2
}, {
"x" : 48.6,
"y" : 24.3
"x" : 48.5,
"y" : 23.5
} ]
},
"id" : 44
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 43.4,
"y" : 24.4
}, {
"x" : 43.4,
"y" : 15.9
}, {
"x" : 44.4,
"y" : 15.9
}, {
"x" : 44.4,
"y" : 24.4
} ]
},
"id" : 45
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 48.6,
"y" : 21.2
}, {
"x" : 46.1,
"y" : 21.2
}, {
"x" : 46.1,
"y" : 20.0
}, {
"x" : 48.6,
"y" : 20.0
} ]
},
"id" : 46
}, {
"shape" : {
"type" : "POLYGON",
......@@ -361,16 +271,16 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 39.4,
"x" : 40.7,
"y" : 15.9
}, {
"x" : 39.4,
"x" : 40.7,
"y" : 24.4
}, {
"x" : 38.4,
"x" : 39.7,
"y" : 24.4
}, {
"x" : 38.4,
"x" : 39.7,
"y" : 15.9
} ]
},
......@@ -379,16 +289,16 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 36.0,
"x" : 36.6,
"y" : 24.4
}, {
"x" : 36.0,
"x" : 36.6,
"y" : 15.9
}, {
"x" : 37.0,
"x" : 37.6,
"y" : 15.9
}, {
"x" : 37.0,
"x" : 37.6,
"y" : 24.4
} ]
},
......@@ -451,17 +361,17 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 16.6,
"y" : 24.0
"x" : 16.474697815370583,
"y" : 24.53976638472107
}, {
"x" : 16.6,
"y" : 15.0
"x" : 16.474697815370583,
"y" : 16.660233615278997
}, {
"x" : 17.8,
"y" : 15.0
"x" : 17.52530218462952,
"y" : 16.660233615278997
}, {
"x" : 17.8,
"y" : 24.0
"x" : 17.52530218462952,
"y" : 24.53976638472107
} ]
},
"id" : 54
......@@ -501,24 +411,6 @@
} ]
},
"id" : 56
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 11.099999999999998,
"y" : 12.799999999999999
}, {
"x" : 10.61578947368421,
"y" : 12.799999999999999
}, {
"x" : 10.61578947368421,
"y" : 8.5
}, {
"x" : 11.099999999999998,
"y" : 8.5
} ]
},
"id" : 57
}, {
"shape" : {
"type" : "POLYGON",
......@@ -631,125 +523,35 @@
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 18.01578947368421,
"y" : 12.799999999999999
}, {
"x" : 18.01578947368421,
"y" : 8.5
}, {
"x" : 18.5,
"y" : 8.5
}, {
"x" : 18.5,
"y" : 12.799999999999999
} ]
},
"id" : 66
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 12.41578947368421,
"y" : 12.799999999999999
}, {
"x" : 12.41578947368421,
"y" : 8.5
}, {
"x" : 12.899999999999999,
"y" : 8.5
}, {
"x" : 12.899999999999999,
"y" : 12.799999999999999
} ]
},
"id" : 67
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 16.21578947368421,
"y" : 12.799999999999999
}, {
"x" : 16.21578947368421,
"y" : 8.5
}, {
"x" : 16.7,
"y" : 8.5
}, {
"x" : 16.7,
"y" : 12.799999999999999
} ]
},
"id" : 68
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 19.7,
"y" : 15.9
}, {
"x" : 20.8,
"y" : 15.9
}, {
"x" : 20.8,
"y" : 19.3
}, {
"x" : 19.7,
"y" : 19.3
} ]
},
"id" : 69
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 13.5,
"y" : 24.1
"x" : 13.574990932069898,
"y" : 24.53131876513672
}, {
"x" : 13.5,
"y" : 15.0
"x" : 13.574990932069898,
"y" : 16.568681234863327
}, {
"x" : 14.7,
"y" : 15.0
"x" : 14.625009067930124,
"y" : 16.568681234863327
}, {
"x" : 14.7,
"y" : 24.1
"x" : 14.625009067930124,
"y" : 24.53131876513672
} ]
},
"id" : 70
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 19.599999999999998,
"y" : 20.900000000000002
}, {
"x" : 20.799999999999997,
"y" : 20.900000000000002
}, {
"x" : 20.799999999999997,
"y" : 24.3
}, {
"x" : 19.599999999999998,
"y" : 24.3
} ]
},
"id" : 71
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 10.3,
"y" : 24.099999999999998
"y" : 24.499999999999996
}, {
"x" : 10.3,
"y" : 14.4
"y" : 14.8
}, {
"x" : 11.600000000000001,
"y" : 14.4
"y" : 14.8
}, {
"x" : 11.600000000000001,
"y" : 24.099999999999998
"y" : 24.499999999999996
} ]
},
"id" : 72
......@@ -758,16 +560,16 @@
"type" : "POLYGON",
"points" : [ {
"x" : 7.2,
"y" : 24.2
"y" : 24.5
}, {
"x" : 7.2,
"y" : 12.7
"y" : 13.0
}, {
"x" : 8.5,
"y" : 12.7
"y" : 13.0
}, {
"x" : 8.5,
"y" : 24.2
"y" : 24.5
} ]
},
"id" : 73
......@@ -776,37 +578,19 @@
"type" : "POLYGON",
"points" : [ {
"x" : 3.7,
"y" : 12.7
"y" : 13.0
}, {
"x" : 5.0,
"y" : 12.7
"y" : 13.0
}, {
"x" : 5.0,
"y" : 24.2
"y" : 24.5
}, {
"x" : 3.7,
"y" : 24.2
"y" : 24.5
} ]
},
"id" : 74
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 14.31578947368421,
"y" : 8.5
}, {
"x" : 14.799999999999999,
"y" : 8.5
}, {
"x" : 14.799999999999999,
"y" : 12.799999999999999
}, {
"x" : 14.31578947368421,
"y" : 12.799999999999999
} ]
},
"id" : 75
}, {
"shape" : {
"type" : "POLYGON",
......@@ -849,6 +633,129 @@
} ]
},
"id" : 65
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 14.9,
"y" : 3.7
}, {
"x" : 14.9,
"y" : 0.6
}, {
"x" : 0.6,
"y" : 0.7
}, {
"x" : 0.7,
"y" : 31.9
}, {
"x" : 26.4,
"y" : 31.9
}, {
"x" : 26.4,
"y" : 27.4
}, {
"x" : 1.5,
"y" : 27.6
}, {
"x" : 1.5,
"y" : 9.9
}, {
"x" : 10.7,
"y" : 9.8
}, {
"x" : 10.7,
"y" : 7.8
}, {
"x" : 5.7,
"y" : 7.8
}, {
"x" : 5.7,
"y" : 3.7
} ]
},
"id" : 5
}, {
"shape" : {
"x" : 19.7,
"y" : 10.5,
"width" : 2.3,
"height" : 3.2,
"type" : "RECTANGLE"
},
"id" : 8
}, {
"shape" : {
"x" : 10.7,
"y" : 8.2,
"width" : 0.6,
"height" : 3.8,
"type" : "RECTANGLE"
},
"id" : 9
}, {
"shape" : {
"x" : 12.3,
"y" : 8.2,
"width" : 0.9,
"height" : 3.8,
"type" : "RECTANGLE"
},
"id" : 10
}, {
"shape" : {
"x" : 14.0,
"y" : 8.3,
"width" : 1.1,
"height" : 3.7,
"type" : "RECTANGLE"
},
"id" : 14
}, {
"shape" : {
"x" : 15.9,
"y" : 8.2,
"width" : 1.1,
"height" : 3.7,
"type" : "RECTANGLE"
},
"id" : 17
}, {
"shape" : {
"x" : 17.9,
"y" : 8.1,
"width" : 0.8,
"height" : 3.9,
"type" : "RECTANGLE"
},
"id" : 18
}, {
"shape" : {
"x" : 19.7,
"y" : 8.2,
"width" : 0.1,
"height" : 3.4,
"type" : "RECTANGLE"
},
"id" : 15
}, {
"shape" : {
"x" : 19.1,
"y" : 20.8,
"width" : 1.8,
"height" : 2.4,
"type" : "RECTANGLE"
},
"id" : 30
}, {
"shape" : {
"x" : 19.1,
"y" : 16.7,
"width" : 1.8,
"height" : 2.7,
"type" : "RECTANGLE"
},
"id" : 31
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
......@@ -1074,7 +981,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
}, {
"id" : 99,
"id" : 98,
"absorbing" : false,
"shape" : {
"x" : 20.8,
......@@ -1126,10 +1033,10 @@
"nextSpeed" : -1.0
}, {
"id" : 200,
"absorbing" : true,
"absorbing" : false,
"shape" : {
"x" : 45.7,
"y" : 12.92834890965732,
"x" : 45.8,
"y" : 12.82834890965732,
"width" : 3.3999999999999986,
"height" : 1.2716510903426794,
"type" : "RECTANGLE"
......@@ -1192,67 +1099,1060 @@
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"targetChangers" : [ {
"id" : 6,
}, {
"id" : 300,
"absorbing" : false,
"shape" : {
"x" : 20.37656784521826,
"y" : 8.69107238096139,
"width" : 1.5849319875217773,
"height" : 1.5417497049281792,
"x" : 22.0,
"y" : 12.234377724705258,
"width" : 1.3747133136206848,
"height" : 1.0631138879411637,
"type" : "RECTANGLE"
},
"reachDistance" : 0.0,
"nextTargetIsPedestrian" : false,
"nextTarget" : [ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 200 ],
"probabilityToChangeTarget" : [ 0.7, 0.4, 0.7, 0.4, 0.7, 0.4, 0.7, 0.4, 0.7, 0.4, 0.7, 0.4, 0.6, 0.4, 0.4, 0.3, 1.0 ]
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting"