Skip to content

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

Topology19 updated (now reads stations as lists for each Job step) - agreement with ulbranch

parent e8834d6a
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 28 deletions
dream/simulation/JSONInputs/Topology19.json
View file @ 595de056
...@@ -34,7 +34,9 @@ ...@@ -34,7 +34,9 @@
"route": [ "route": [
{ {
"stepNumber": "0", "stepNumber": "0",
"stationId": "Q1", "stationIdsList": [
"Q1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -42,7 +44,9 @@ ...@@ -42,7 +44,9 @@
}, },
{ {
"stepNumber": "1", "stepNumber": "1",
"stationId": "M1", "stationIdsList": [
"M1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
...@@ -50,7 +54,9 @@ ...@@ -50,7 +54,9 @@
}, },
{ {
"stepNumber": "2", "stepNumber": "2",
"stationId": "Q3", "stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -58,7 +64,9 @@ ...@@ -58,7 +64,9 @@
}, },
{ {
"stepNumber": "3", "stepNumber": "3",
"stationId": "M3", "stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "3" "mean": "3"
...@@ -66,7 +74,9 @@ ...@@ -66,7 +74,9 @@
}, },
{ {
"stepNumber": "4", "stepNumber": "4",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -74,7 +84,9 @@ ...@@ -74,7 +84,9 @@
}, },
{ {
"stepNumber": "5", "stepNumber": "5",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "2" "mean": "2"
...@@ -82,7 +94,9 @@ ...@@ -82,7 +94,9 @@
}, },
{ {
"stepNumber": "6", "stepNumber": "6",
"stationId": "E1", "stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -106,7 +120,9 @@ ...@@ -106,7 +120,9 @@
"route": [ "route": [
{ {
"stepNumber": "0", "stepNumber": "0",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -114,7 +130,9 @@ ...@@ -114,7 +130,9 @@
}, },
{ {
"stepNumber": "1", "stepNumber": "1",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "3" "mean": "3"
...@@ -122,7 +140,9 @@ ...@@ -122,7 +140,9 @@
}, },
{ {
"stepNumber": "2", "stepNumber": "2",
"stationId": "Q3", "stationIdsList": [
"Q3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -130,7 +150,9 @@ ...@@ -130,7 +150,9 @@
}, },
{ {
"stepNumber": "3", "stepNumber": "3",
"stationId": "M3", "stationIdsList": [
"M3"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "1" "mean": "1"
...@@ -138,7 +160,9 @@ ...@@ -138,7 +160,9 @@
}, },
{ {
"stepNumber": "4", "stepNumber": "4",
"stationId": "Q2", "stationIdsList": [
"Q2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
...@@ -146,7 +170,9 @@ ...@@ -146,7 +170,9 @@
}, },
{ {
"stepNumber": "5", "stepNumber": "5",
"stationId": "M2", "stationIdsList": [
"M2"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "7" "mean": "7"
...@@ -154,7 +180,9 @@ ...@@ -154,7 +180,9 @@
}, },
{ {
"stepNumber": "6", "stepNumber": "6",
"stationId": "E1", "stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
......
dream/tests/dump/Topology19.json.result
View file @ 595de056
...@@ -13,59 +13,73 @@ ...@@ -13,59 +13,73 @@
"extraPropertyDict": { "extraPropertyDict": {
"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": "2" "mean": "2"
}, },
"stationId": "M2",
"stepNumber": "5" "stepNumber": "5"
}, },
{ {
"stationIdsList": [
"E1"
],
"processingTime": { "processingTime": {
"distributionType": "Fixed", "distributionType": "Fixed",
"mean": "0" "mean": "0"
}, },
"stationId": "E1",
"stepNumber": "6" "stepNumber": "6"
} }
], ],
...@@ -118,59 +132,73 @@ ...@@ -118,59 +132,73 @@
"extraPropertyDict": { "extraPropertyDict": {
"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": "0" "mean": "0"
}, },
"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"
} }
], ],
......
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