Skip to content

dream
dream
Commit 41604f8a authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Jérome Perrin
Browse files
Options

Topology20 updated according the new notation - agreement with ulbranch

parent 595de056
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 44 deletions
dream/simulation/JSONInputs/Topology20.json
View file @ 41604f8a
...@@ -38,7 +38,9 @@ ...@@ -38,7 +38,9 @@
"route": [ "route": [
{ {
"stepNumber": "0", "stepNumber": "0",
"stationId": "Q1", "stationIdsList": [
"Q1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -46,7 +48,9 @@ ...@@ -46,7 +48,9 @@
}, },
{ {
"stepNumber": "1", "stepNumber": "1",
"stationId": "M1", "stationIdsList": [
"M1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
...@@ -54,7 +58,9 @@ ...@@ -54,7 +58,9 @@
}, },
{ {
"stepNumber": "2", "stepNumber": "2",
"stationId": "Q3", "stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -62,7 +68,9 @@ ...@@ -62,7 +68,9 @@
}, },
{ {
"stepNumber": "3", "stepNumber": "3",
"stationId": "M3", "stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "3" "mean": "3"
...@@ -70,7 +78,9 @@ ...@@ -70,7 +78,9 @@
}, },
{ {
"stepNumber": "4", "stepNumber": "4",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -78,7 +88,9 @@ ...@@ -78,7 +88,9 @@
}, },
{ {
"stepNumber": "5", "stepNumber": "5",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "4" "mean": "4"
...@@ -86,7 +98,9 @@ ...@@ -86,7 +98,9 @@
}, },
{ {
"stepNumber": "6", "stepNumber": "6",
"stationId": "E1", "stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -113,7 +127,9 @@ ...@@ -113,7 +127,9 @@
"route": [ "route": [
{ {
"stepNumber": "0", "stepNumber": "0",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -121,7 +137,9 @@ ...@@ -121,7 +137,9 @@
}, },
{ {
"stepNumber": "1", "stepNumber": "1",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "3" "mean": "3"
...@@ -129,7 +147,9 @@ ...@@ -129,7 +147,9 @@
}, },
{ {
"stepNumber": "2", "stepNumber": "2",
"stationId": "Q3", "stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -137,7 +157,9 @@ ...@@ -137,7 +157,9 @@
}, },
{ {
"stepNumber": "3", "stepNumber": "3",
"stationId": "M3", "stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
...@@ -145,7 +167,9 @@ ...@@ -145,7 +167,9 @@
}, },
{ {
"stepNumber": "4", "stepNumber": "4",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "7" "mean": "7"
...@@ -153,7 +177,9 @@ ...@@ -153,7 +177,9 @@
}, },
{ {
"stepNumber": "5", "stepNumber": "5",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "7" "mean": "7"
...@@ -161,7 +187,9 @@ ...@@ -161,7 +187,9 @@
}, },
{ {
"stepNumber": "6", "stepNumber": "6",
"stationId": "E1", "stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -179,7 +207,9 @@ ...@@ -179,7 +207,9 @@
"route": [ "route": [
{ {
"stepNumber": "0", "stepNumber": "0",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -187,7 +217,9 @@ ...@@ -187,7 +217,9 @@
}, },
{ {
"stepNumber": "1", "stepNumber": "1",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "2" "mean": "2"
...@@ -195,7 +227,9 @@ ...@@ -195,7 +227,9 @@
}, },
{ {
"stepNumber": "2", "stepNumber": "2",
"stationId": "Q3", "stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -203,7 +237,9 @@ ...@@ -203,7 +237,9 @@
}, },
{ {
"stepNumber": "3", "stepNumber": "3",
"stationId": "M3", "stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
...@@ -211,7 +247,9 @@ ...@@ -211,7 +247,9 @@
}, },
{ {
"stepNumber": "4", "stepNumber": "4",
"stationId": "E1", "stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -229,7 +267,9 @@ ...@@ -229,7 +267,9 @@
"route": [ "route": [
{ {
"stepNumber": "0", "stepNumber": "0",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -237,7 +277,9 @@ ...@@ -237,7 +277,9 @@
}, },
{ {
"stepNumber": "1", "stepNumber": "1",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "7" "mean": "7"
...@@ -245,7 +287,9 @@ ...@@ -245,7 +287,9 @@
}, },
{ {
"stepNumber": "2", "stepNumber": "2",
"stationId": "E1", "stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
......
dream/tests/dump/Topology20.json.result
View file @ 41604f8a
...@@ -14,59 +14,73 @@ ...@@ -14,59 +14,73 @@
"priority": "1", "priority": "1",
"route": [ "route": [
{ {
"stationIdsList": [
"Q1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q1",
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
}, },
"stationId": "M1",
"stepNumber": "1" "stepNumber": "1"
}, },
{ {
"stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q3",
"stepNumber": "2" "stepNumber": "2"
}, },
{ {
"stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "3" "mean": "3"
}, },
"stationId": "M3",
"stepNumber": "3" "stepNumber": "3"
}, },
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q2",
"stepNumber": "4" "stepNumber": "4"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "4" "mean": "4"
}, },
"stationId": "M2",
"stepNumber": "5" "stepNumber": "5"
}, },
{ {
"stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "E1",
"stepNumber": "6" "stepNumber": "6"
} }
], ],
...@@ -123,59 +137,73 @@ ...@@ -123,59 +137,73 @@
"priority": "-7", "priority": "-7",
"route": [ "route": [
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q2",
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "3" "mean": "3"
}, },
"stationId": "M2",
"stepNumber": "1" "stepNumber": "1"
}, },
{ {
"stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q3",
"stepNumber": "2" "stepNumber": "2"
}, },
{ {
"stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
}, },
"stationId": "M3",
"stepNumber": "3" "stepNumber": "3"
}, },
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "7" "mean": "7"
}, },
"stationId": "Q2",
"stepNumber": "4" "stepNumber": "4"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "7" "mean": "7"
}, },
"stationId": "M2",
"stepNumber": "5" "stepNumber": "5"
}, },
{ {
"stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "E1",
"stepNumber": "6" "stepNumber": "6"
} }
], ],
...@@ -232,43 +260,53 @@ ...@@ -232,43 +260,53 @@
"priority": "-12", "priority": "-12",
"route": [ "route": [
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q2",
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "2" "mean": "2"
}, },
"stationId": "M2",
"stepNumber": "1" "stepNumber": "1"
}, },
{ {
"stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q3",
"stepNumber": "2" "stepNumber": "2"
}, },
{ {
"stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
}, },
"stationId": "M3",
"stepNumber": "3" "stepNumber": "3"
}, },
{ {
"stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "E1",
"stepNumber": "4" "stepNumber": "4"
} }
], ],
...@@ -315,27 +353,33 @@ ...@@ -315,27 +353,33 @@
"priority": "0", "priority": "0",
"route": [ "route": [
{ {
"stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "Q2",
"stepNumber": "0" "stepNumber": "0"
}, },
{ {
"stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "7" "mean": "7"
}, },
"stationId": "M2",
"stepNumber": "1" "stepNumber": "1"
}, },
{ {
"stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "E1",
"stepNumber": "2" "stepNumber": "2"
} }
], ],
......
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