Skip to content

dream
dream
Commit 227a45a1 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos
Browse files
Options

Topologies 66/67 setupTime dict updated

parent 419bf8a0
Hide whitespace changes
Inline Side-by-side
Showing with 317 additions and 510 deletions
dream/simulation/JSONInputs/Topology66.json
View file @ 227a45a1
......@@ -38,8 +38,8 @@
"mean": "1"
},
"setupTime": {
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
}
],
......@@ -72,8 +72,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -92,8 +92,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -112,8 +112,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -158,8 +158,8 @@
"mean": "1"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.6"
"distributionType": "Fixed",
"mean": "0.6"
}
},
{
......@@ -178,8 +178,8 @@
"mean": "4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.4"
"distributionType": "Fixed",
"mean": "0.4"
}
},
{
......@@ -198,8 +198,8 @@
"mean": "1"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.6"
"distributionType": "Fixed",
"mean": "0.6"
}
},
{
......@@ -247,8 +247,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -284,8 +284,8 @@
"mean": "1.4"
},
"setupTime": {
"setupDistribution": "Fixed",
"setupMean": "0.7"
"distributionType": "Fixed",
"mean": "0.7"
}
}
],
......@@ -318,8 +318,8 @@
"mean": "0.3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -338,8 +338,8 @@
"mean": "3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "1.2"
"distributionType": "Fixed",
"mean": "1.2"
}
},
{
......@@ -358,8 +358,8 @@
"mean": "0.9"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -404,8 +404,8 @@
"mean": "0.8"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.2"
"distributionType": "Fixed",
"mean": "0.2"
}
},
{
......@@ -424,8 +424,8 @@
"mean": "0.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -444,8 +444,8 @@
"mean": "1.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -493,8 +493,8 @@
"mean": "0.7"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -530,8 +530,8 @@
"mean": "2.4"
},
"setupTime": {
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
}
],
......@@ -564,8 +564,8 @@
"mean": "0.8"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -584,8 +584,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "2.2"
"distributionType": "Fixed",
"mean": "2.2"
}
},
{
......@@ -604,8 +604,8 @@
"mean": "0.9"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -650,8 +650,8 @@
"mean": "0.2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.2"
"distributionType": "Fixed",
"mean": "0.2"
}
},
{
......@@ -670,8 +670,8 @@
"mean": "0.8"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -690,8 +690,8 @@
"mean": "0.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "1.3"
"distributionType": "Fixed",
"mean": "1.3"
}
},
{
......@@ -736,8 +736,8 @@
"mean": "0.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -756,8 +756,8 @@
"mean": "0.2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -776,8 +776,8 @@
"mean": "0.1"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -825,8 +825,8 @@
"mean": "0.3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.2"
"distributionType": "Fixed",
"mean": "0.2"
}
},
{
......
dream/simulation/JSONInputs/Topology67.json
View file @ 227a45a1
......@@ -39,8 +39,8 @@
"mean": "1"
},
"setupTime": {
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
}
],
......@@ -73,8 +73,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -93,8 +93,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -113,8 +113,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -159,8 +159,8 @@
"mean": "1"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.6"
"distributionType": "Fixed",
"mean": "0.6"
}
},
{
......@@ -179,8 +179,8 @@
"mean": "4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.4"
"distributionType": "Fixed",
"mean": "0.4"
}
},
{
......@@ -199,8 +199,8 @@
"mean": "1"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.6"
"distributionType": "Fixed",
"mean": "0.6"
}
},
{
......@@ -248,8 +248,8 @@
"mean": "2"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.5"
"distributionType": "Fixed",
"mean": "0.5"
}
},
{
......@@ -285,8 +285,8 @@
"mean": "1.4"
},
"setupTime": {
"setupDistribution": "Fixed",
"setupMean": "0.7"
"distributionType": "Fixed",
"mean": "0.7"
}
}
],
......@@ -319,8 +319,8 @@
"mean": "0.3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -339,8 +339,8 @@
"mean": "3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "1.2"
"distributionType": "Fixed",
"mean": "1.2"
}
},
{
......@@ -359,8 +359,8 @@
"mean": "0.9"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -405,8 +405,8 @@
"mean": "0.8"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.2"
"distributionType": "Fixed",
"mean": "0.2"
}
},
{
......@@ -425,8 +425,8 @@
"mean": "0.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -445,8 +445,8 @@
"mean": "1.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -494,8 +494,8 @@
"mean": "0.7"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -531,8 +531,8 @@
"mean": "1.4"
},
"setupTime": {
"setupDistribution": "Fixed",
"setupMean": "0.7"
"distributionType": "Fixed",
"mean": "0.7"
}
}
],
......@@ -565,8 +565,8 @@
"mean": "0.3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -585,8 +585,8 @@
"mean": "3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "1.2"
"distributionType": "Fixed",
"mean": "1.2"
}
},
{
......@@ -605,8 +605,8 @@
"mean": "0.9"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -651,8 +651,8 @@
"mean": "0.8"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.2"
"distributionType": "Fixed",
"mean": "0.2"
}
},
{
......@@ -671,8 +671,8 @@
"mean": "0.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -691,8 +691,8 @@
"mean": "1.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -740,8 +740,8 @@
"mean": "0.7"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -777,8 +777,8 @@
"mean": "1.4"
},
"setupTime": {
"setupDistribution": "Fixed",
"setupMean": "0.7"
"distributionType": "Fixed",
"mean": "0.7"
}
}
],
......@@ -811,8 +811,8 @@
"mean": "0.3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -831,8 +831,8 @@
"mean": "3"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "1.2"
"distributionType": "Fixed",
"mean": "1.2"
}
},
{
......@@ -851,8 +851,8 @@
"mean": "0.9"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -897,8 +897,8 @@
"mean": "0.8"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.2"
"distributionType": "Fixed",
"mean": "0.2"
}
},
{
......@@ -917,8 +917,8 @@
"mean": "0.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -937,8 +937,8 @@
"mean": "1.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -983,8 +983,8 @@
"mean": "0.8"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.2"
"distributionType": "Fixed",
"mean": "0.2"
}
},
{
......@@ -1003,8 +1003,8 @@
"mean": "0.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......@@ -1023,8 +1023,8 @@
"mean": "1.4"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.3"
"distributionType": "Fixed",
"mean": "0.3"
}
},
{
......@@ -1072,8 +1072,8 @@
"mean": "0.7"
},
"setupTime":{
"setupDistribution": "Fixed",
"setupMean": "0.1"
"distributionType": "Fixed",
"mean": "0.1"
}
},
{
......
dream/tests/dump/Topology66.json.result
View file @ 227a45a1
......@@ -13,48 +13,39 @@
"schedule": [
{
"entranceTime": 1.5,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 1.5,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 3.6,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 6.1,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 6.499999999999999,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 9.0,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 13.4,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 15.9,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 26.2,
"stationId": "MA2",
"stepNumber": 8
"stationId": "MA2"
}
]
}
......@@ -67,48 +58,39 @@
"schedule": [
{
"entranceTime": 3.6,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 3.6,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 6.1,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 6.499999999999999,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 9.0,
"stationId": "MILL1",
"stepNumber": 4
"stationId": "MILL1"
},
{
"entranceTime": 13.2,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 17.5,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 18.7,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 28.9,
"stationId": "MA3",
"stepNumber": 8
"stationId": "MA3"
}
]
}
......@@ -121,48 +103,39 @@
"schedule": [
{
"entranceTime": 2.6999999999999997,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 2.6999999999999997,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 2.6999999999999997,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 3.5999999999999996,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 3.5999999999999996,
"stationId": "MILL1",
"stepNumber": 4
"stationId": "MILL1"
},
{
"entranceTime": 7.8,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 7.8,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 9.0,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 13.4,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -175,48 +148,39 @@
"schedule": [
{
"entranceTime": 1.5,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 1.5,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 15.9,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 17.5,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 19.7,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 24.099999999999998,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 24.599999999999998,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 26.2,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 26.2,
"stationId": "MA2",
"stepNumber": 8
"stationId": "MA2"
}
]
}
......@@ -229,48 +193,39 @@
"schedule": [
{
"entranceTime": 3.6,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 3.6,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 18.7,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 19.7,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 24.099999999999998,
"stationId": "MILL1",
"stepNumber": 4
"stationId": "MILL1"
},
{
"entranceTime": 24.599999999999998,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 27.2,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 28.9,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 28.9,
"stationId": "MA3",
"stepNumber": 8
"stationId": "MA3"
}
]
}
......@@ -283,48 +238,39 @@
"schedule": [
{
"entranceTime": 2.6999999999999997,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 2.6999999999999997,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 9.0,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 9.399999999999999,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 9.899999999999999,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 11.0,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 11.299999999999999,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 13.0,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 13.4,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -337,48 +283,39 @@
"schedule": [
{
"entranceTime": 2.6999999999999997,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 2.6999999999999997,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 9.399999999999999,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 9.899999999999999,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 11.0,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 11.299999999999999,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 13.0,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 13.4,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 13.4,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -472,23 +409,19 @@
"schedule": [
{
"entranceTime": 26.2,
"stationId": "MA2",
"stepNumber": 0
"stationId": "MA2"
},
{
"entranceTime": 27.2,
"stationId": "QIM",
"stepNumber": 1
"stationId": "QIM"
},
{
"entranceTime": 30.9,
"stationId": "IM",
"stepNumber": 2
"stationId": "IM"
},
{
"entranceTime": 33.4,
"stationId": "E1",
"stepNumber": 3
"stationId": "E1"
}
]
}
......@@ -501,23 +434,19 @@
"schedule": [
{
"entranceTime": 28.9,
"stationId": "MA3",
"stepNumber": 0
"stationId": "MA3"
},
{
"entranceTime": 30.9,
"stationId": "QIM",
"stepNumber": 1
"stationId": "QIM"
},
{
"entranceTime": 33.4,
"stationId": "IM",
"stepNumber": 2
"stationId": "IM"
},
{
"entranceTime": 34.2,
"stationId": "E1",
"stepNumber": 3
"stationId": "E1"
}
]
}
......@@ -530,23 +459,19 @@
"schedule": [
{
"entranceTime": 13.4,
"stationId": "MA1",
"stepNumber": 0
"stationId": "MA1"
},
{
"entranceTime": 16.4,
"stationId": "QIM",
"stepNumber": 1
"stationId": "QIM"
},
{
"entranceTime": 16.4,
"stationId": "IM",
"stepNumber": 2
"stationId": "IM"
},
{
"entranceTime": 16.9,
"stationId": "E1",
"stepNumber": 3
"stationId": "E1"
}
]
}
......@@ -619,18 +544,15 @@
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
"stationId": "Q0"
},
{
"entranceTime": 0.0,
"stationId": "CAD2",
"stepNumber": 1
"stationId": "CAD2"
},
{
"entranceTime": 1.5,
"stationId": "OD0",
"stepNumber": 2
"stationId": "OD0"
}
]
}
......@@ -643,18 +565,15 @@
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
"stationId": "Q0"
},
{
"entranceTime": 1.5,
"stationId": "CAD2",
"stepNumber": 1
"stationId": "CAD2"
},
{
"entranceTime": 3.6,
"stationId": "OD0",
"stepNumber": 2
"stationId": "OD0"
}
]
}
......@@ -667,18 +586,15 @@
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
"stationId": "Q0"
},
{
"entranceTime": 0.0,
"stationId": "CAD1",
"stepNumber": 1
"stationId": "CAD1"
},
{
"entranceTime": 2.6999999999999997,
"stationId": "OD0",
"stepNumber": 2
"stationId": "OD0"
}
]
}
......
dream/tests/dump/Topology67.json.result
View file @ 227a45a1
......@@ -13,48 +13,39 @@
"schedule": [
{
"entranceTime": 1.5,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 1.5,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 1.5,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 4.0,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 4.0,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 6.5,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 6.5,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 9.0,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 18.7,
"stationId": "MA3",
"stepNumber": 8
"stationId": "MA3"
}
]
}
......@@ -67,48 +58,39 @@
"schedule": [
{
"entranceTime": 2.0999999999999996,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 2.0999999999999996,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 2.0999999999999996,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 2.4999999999999996,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 2.4999999999999996,
"stationId": "MILL1",
"stepNumber": 4
"stationId": "MILL1"
},
{
"entranceTime": 6.699999999999999,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 9.0,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 10.200000000000001,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 13.600000000000001,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -121,48 +103,39 @@
"schedule": [
{
"entranceTime": 3.6,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 3.6,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 3.6,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 4.0,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 6.5,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 10.7,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 10.7,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 11.9,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 15.300000000000002,
"stationId": "MA2",
"stepNumber": 8
"stationId": "MA2"
}
]
}
......@@ -175,48 +148,39 @@
"schedule": [
{
"entranceTime": 17.099999999999998,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 17.099999999999998,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 22.2,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 22.6,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 22.6,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 26.8,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 26.8,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 28.0,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 34.4,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -229,48 +193,39 @@
"schedule": [
{
"entranceTime": 1.5,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 1.5,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 9.0,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 10.6,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 10.6,
"stationId": "MILL1",
"stepNumber": 4
"stationId": "MILL1"
},
{
"entranceTime": 15.0,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 17.099999999999998,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 18.7,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 18.7,
"stationId": "MA3",
"stepNumber": 8
"stationId": "MA3"
}
]
}
......@@ -283,48 +238,39 @@
"schedule": [
{
"entranceTime": 2.0999999999999996,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 2.0999999999999996,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 10.200000000000001,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 11.200000000000001,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 11.200000000000001,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 11.700000000000001,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 11.9,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 13.600000000000001,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 13.600000000000001,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -337,48 +283,39 @@
"schedule": [
{
"entranceTime": 3.6,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 3.6,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 11.9,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 12.9,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 12.9,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 13.4,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 13.600000000000001,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 15.300000000000002,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 15.300000000000002,
"stationId": "MA2",
"stepNumber": 8
"stationId": "MA2"
}
]
}
......@@ -391,48 +328,39 @@
"schedule": [
{
"entranceTime": 17.099999999999998,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 17.099999999999998,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 28.0,
"stationId": "CAM1",
"stepNumber": 2
"stationId": "CAM1"
},
{
"entranceTime": 29.0,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 30.0,
"stationId": "MILL1",
"stepNumber": 4
"stationId": "MILL1"
},
{
"entranceTime": 30.5,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 31.0,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 32.7,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 34.4,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -445,48 +373,39 @@
"schedule": [
{
"entranceTime": 17.099999999999998,
"stationId": "OD0",
"stepNumber": 0
"stationId": "OD0"
},
{
"entranceTime": 17.099999999999998,
"stationId": "QCAM",
"stepNumber": 1
"stationId": "QCAM"
},
{
"entranceTime": 29.0,
"stationId": "CAM2",
"stepNumber": 2
"stationId": "CAM2"
},
{
"entranceTime": 30.0,
"stationId": "QMILL",
"stepNumber": 3
"stationId": "QMILL"
},
{
"entranceTime": 30.5,
"stationId": "MILL2",
"stepNumber": 4
"stationId": "MILL2"
},
{
"entranceTime": 31.0,
"stationId": "QEDM",
"stepNumber": 5
"stationId": "QEDM"
},
{
"entranceTime": 32.7,
"stationId": "EDM",
"stepNumber": 6
"stationId": "EDM"
},
{
"entranceTime": 34.4,
"stationId": "AB1",
"stepNumber": 7
"stationId": "AB1"
},
{
"entranceTime": 34.4,
"stationId": "MA1",
"stepNumber": 8
"stationId": "MA1"
}
]
}
......@@ -580,23 +499,19 @@
"schedule": [
{
"entranceTime": 18.7,
"stationId": "MA3",
"stepNumber": 0
"stationId": "MA3"
},
{
"entranceTime": 19.7,
"stationId": "QIM",
"stepNumber": 1
"stationId": "QIM"
},
{
"entranceTime": 19.7,
"stationId": "IM",
"stepNumber": 2
"stationId": "IM"
},
{
"entranceTime": 22.2,
"stationId": "E1",
"stepNumber": 3
"stationId": "E1"
}
]
}
......@@ -609,23 +524,19 @@
"schedule": [
{
"entranceTime": 13.600000000000001,
"stationId": "MA1",
"stepNumber": 0
"stationId": "MA1"
},
{
"entranceTime": 15.600000000000001,
"stationId": "QIM",
"stepNumber": 1
"stationId": "QIM"
},
{
"entranceTime": 15.600000000000001,
"stationId": "IM",
"stepNumber": 2
"stationId": "IM"
},
{
"entranceTime": 16.400000000000002,
"stationId": "E1",
"stepNumber": 3
"stationId": "E1"
}
]
}
......@@ -638,23 +549,19 @@
"schedule": [
{
"entranceTime": 15.300000000000002,
"stationId": "MA2",
"stepNumber": 0
"stationId": "MA2"
},
{
"entranceTime": 17.300000000000004,
"stationId": "QIM",
"stepNumber": 1
"stationId": "QIM"
},
{
"entranceTime": 17.300000000000004,
"stationId": "IM",
"stepNumber": 2
"stationId": "IM"
},
{
"entranceTime": 18.100000000000005,
"stationId": "E1",
"stepNumber": 3
"stationId": "E1"
}
]
}
......@@ -667,23 +574,19 @@
"schedule": [
{
"entranceTime": 34.4,
"stationId": "MA1",
"stepNumber": 0
"stationId": "MA1"
},
{
"entranceTime": 36.4,
"stationId": "QIM",
"stepNumber": 1
"stationId": "QIM"
},
{
"entranceTime": 36.4,
"stationId": "IM",
"stepNumber": 2
"stationId": "IM"
},
{
"entranceTime": 37.2,
"stationId": "E1",
"stepNumber": 3
"stationId": "E1"
}
]
}
......@@ -756,18 +659,15 @@
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
"stationId": "Q0"
},
{
"entranceTime": 0.0,
"stationId": "CAD2",
"stepNumber": 1
"stationId": "CAD2"
},
{
"entranceTime": 1.5,
"stationId": "OD0",
"stepNumber": 2
"stationId": "OD0"
}
]
}
......@@ -780,18 +680,15 @@
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
"stationId": "Q0"
},
{
"entranceTime": 0.0,
"stationId": "CAD1",
"stepNumber": 1
"stationId": "CAD1"
},
{
"entranceTime": 2.0999999999999996,
"stationId": "OD0",
"stepNumber": 2
"stationId": "OD0"
}
]
}
......@@ -804,18 +701,15 @@
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
"stationId": "Q0"
},
{
"entranceTime": 1.5,
"stationId": "CAD2",
"stepNumber": 1
"stationId": "CAD2"
},
{
"entranceTime": 3.6,
"stationId": "OD0",
"stepNumber": 2
"stationId": "OD0"
}
]
}
......@@ -828,18 +722,15 @@
"schedule": [
{
"entranceTime": 0,
"stationId": "Q0",
"stepNumber": 0
"stationId": "Q0"
},
{
"entranceTime": 15.0,
"stationId": "CAD1",
"stepNumber": 1
"stationId": "CAD1"
},
{
"entranceTime": 17.099999999999998,
"stationId": "OD0",
"stepNumber": 2
"stationId": "OD0"
}
]
}
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7