Skip to content

dream
dream
Commit 3b04f4a6 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

JSONInputs: remove stepNumbers of components

parent 8f1a82ad
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 538 deletions
dream/simulation/JSONInputs/Topology37.json
View file @ 3b04f4a6
...@@ -50,8 +50,7 @@ ...@@ -50,8 +50,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -60,8 +59,7 @@ ...@@ -60,8 +59,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"Q1" "Q1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -70,8 +68,7 @@ ...@@ -70,8 +68,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"M1" "M1"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -80,8 +77,7 @@ ...@@ -80,8 +77,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"E1" "E1"
], ]
"stepNumber": "3"
} }
] ]
}, },
...@@ -97,8 +93,7 @@ ...@@ -97,8 +93,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -107,8 +102,7 @@ ...@@ -107,8 +102,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"Q2" "Q2"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -117,8 +111,7 @@ ...@@ -117,8 +111,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"M2" "M2"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -127,8 +120,7 @@ ...@@ -127,8 +120,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"E1" "E1"
], ]
"stepNumber": "3"
} }
] ]
} }
......
dream/simulation/JSONInputs/Topology39.json
View file @ 3b04f4a6
...@@ -58,8 +58,7 @@ ...@@ -58,8 +58,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -68,8 +67,7 @@ ...@@ -68,8 +67,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"Q1" "Q1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -78,8 +76,7 @@ ...@@ -78,8 +76,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"M1" "M1"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -88,8 +85,7 @@ ...@@ -88,8 +85,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -98,8 +94,7 @@ ...@@ -98,8 +94,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "4"
} }
] ]
}, },
...@@ -115,8 +110,7 @@ ...@@ -115,8 +110,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -125,8 +119,7 @@ ...@@ -125,8 +119,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"Q1" "Q1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -135,8 +128,7 @@ ...@@ -135,8 +128,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"M1" "M1"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -145,8 +137,7 @@ ...@@ -145,8 +137,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -155,8 +146,7 @@ ...@@ -155,8 +146,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "4"
} }
] ]
}, },
...@@ -172,8 +162,7 @@ ...@@ -172,8 +162,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -182,8 +171,7 @@ ...@@ -182,8 +171,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"E1" "E1"
], ]
"stepNumber": "1"
} }
] ]
} }
......
dream/simulation/JSONInputs/Topology40.json
View file @ 3b04f4a6
...@@ -64,8 +64,7 @@ ...@@ -64,8 +64,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -74,8 +73,7 @@ ...@@ -74,8 +73,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"CB1" "CB1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -84,8 +82,7 @@ ...@@ -84,8 +82,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"M1" "M1"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -94,8 +91,7 @@ ...@@ -94,8 +91,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -104,8 +100,7 @@ ...@@ -104,8 +100,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "4"
} }
] ]
}, },
...@@ -122,8 +117,7 @@ ...@@ -122,8 +117,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -132,8 +126,7 @@ ...@@ -132,8 +126,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"CB1" "CB1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -142,8 +135,7 @@ ...@@ -142,8 +135,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"M1" "M1"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -152,8 +144,7 @@ ...@@ -152,8 +144,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -162,8 +153,7 @@ ...@@ -162,8 +153,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "4"
} }
] ]
}, },
...@@ -179,8 +169,7 @@ ...@@ -179,8 +169,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -189,8 +178,7 @@ ...@@ -189,8 +178,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"E1" "E1"
], ]
"stepNumber": "1"
} }
] ]
} }
......
dream/simulation/JSONInputs/Topology41.json
View file @ 3b04f4a6
...@@ -68,8 +68,7 @@ ...@@ -68,8 +68,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -78,8 +77,7 @@ ...@@ -78,8 +77,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"CB1" "CB1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -89,8 +87,7 @@ ...@@ -89,8 +87,7 @@
"stationIdsList": [ "stationIdsList": [
"M1", "M1",
"M2" "M2"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -99,8 +96,7 @@ ...@@ -99,8 +96,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -109,8 +105,7 @@ ...@@ -109,8 +105,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "4"
} }
] ]
}, },
...@@ -127,8 +122,7 @@ ...@@ -127,8 +122,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -137,8 +131,7 @@ ...@@ -137,8 +131,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"CB1" "CB1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -148,8 +141,7 @@ ...@@ -148,8 +141,7 @@
"stationIdsList": [ "stationIdsList": [
"M1", "M1",
"M2" "M2"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -158,8 +150,7 @@ ...@@ -158,8 +150,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -168,8 +159,7 @@ ...@@ -168,8 +159,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "4"
} }
] ]
}, },
...@@ -186,8 +176,7 @@ ...@@ -186,8 +176,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -196,8 +185,7 @@ ...@@ -196,8 +185,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"CB1" "CB1"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -207,8 +195,7 @@ ...@@ -207,8 +195,7 @@
"stationIdsList": [ "stationIdsList": [
"M1", "M1",
"M2" "M2"
], ]
"stepNumber": "2"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -217,8 +204,7 @@ ...@@ -217,8 +204,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -227,8 +213,7 @@ ...@@ -227,8 +213,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "4"
} }
] ]
}, },
...@@ -244,8 +229,7 @@ ...@@ -244,8 +229,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"MA1" "MA1"
], ]
"stepNumber": "0"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -254,8 +238,7 @@ ...@@ -254,8 +238,7 @@
}, },
"stationIdsList": [ "stationIdsList": [
"E1" "E1"
], ]
"stepNumber": "1"
} }
] ]
} }
......
dream/simulation/JSONInputs/Topology56.json
View file @ 3b04f4a6
...@@ -105,14 +105,12 @@ ...@@ -105,14 +105,12 @@
{ {
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QCAM" "QCAM"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -126,14 +124,12 @@ ...@@ -126,14 +124,12 @@
"stationIdsList": [ "stationIdsList": [
"CAM1", "CAM1",
"CAM2" "CAM2"
], ]
"stepNumber": "2"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QMILL" "QMILL"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -147,14 +143,12 @@ ...@@ -147,14 +143,12 @@
"stationIdsList": [ "stationIdsList": [
"MILL1", "MILL1",
"MILL2" "MILL2"
], ]
"stepNumber": "4"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QEDM" "QEDM"
], ]
"stepNumber": "5"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -167,22 +161,19 @@ ...@@ -167,22 +161,19 @@
}, },
"stationIdsList": [ "stationIdsList": [
"EDM" "EDM"
], ]
"stepNumber": "6"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "7"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"MA1", "MA1",
"MA2", "MA2",
"MA3" "MA3"
], ]
"stepNumber": "8"
} }
] ]
}, },
...@@ -195,14 +186,12 @@ ...@@ -195,14 +186,12 @@
{ {
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QCAM" "QCAM"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -216,14 +205,12 @@ ...@@ -216,14 +205,12 @@
"stationIdsList": [ "stationIdsList": [
"CAM1", "CAM1",
"CAM2" "CAM2"
], ]
"stepNumber": "2"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QMILL" "QMILL"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -237,14 +224,12 @@ ...@@ -237,14 +224,12 @@
"stationIdsList": [ "stationIdsList": [
"MILL1", "MILL1",
"MILL2" "MILL2"
], ]
"stepNumber": "4"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QEDM" "QEDM"
], ]
"stepNumber": "5"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -257,22 +242,19 @@ ...@@ -257,22 +242,19 @@
}, },
"stationIdsList": [ "stationIdsList": [
"EDM" "EDM"
], ]
"stepNumber": "6"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "7"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"MA1", "MA1",
"MA2", "MA2",
"MA3" "MA3"
], ]
"stepNumber": "8"
} }
] ]
}, },
...@@ -290,14 +272,12 @@ ...@@ -290,14 +272,12 @@
"MA1", "MA1",
"MA2", "MA2",
"MA3" "MA3"
], ]
"stepNumber": "0"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QIM" "QIM"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -310,14 +290,12 @@ ...@@ -310,14 +290,12 @@
}, },
"stationIdsList": [ "stationIdsList": [
"IM" "IM"
], ]
"stepNumber": "2"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"E1" "E1"
], ]
"stepNumber": "3"
} }
] ]
} }
......
dream/simulation/JSONInputs/Topology57.json
View file @ 3b04f4a6
...@@ -105,14 +105,12 @@ ...@@ -105,14 +105,12 @@
{ {
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QCAM" "QCAM"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -126,14 +124,12 @@ ...@@ -126,14 +124,12 @@
"stationIdsList": [ "stationIdsList": [
"CAM1", "CAM1",
"CAM2" "CAM2"
], ]
"stepNumber": "2"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QMILL" "QMILL"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -147,14 +143,12 @@ ...@@ -147,14 +143,12 @@
"stationIdsList": [ "stationIdsList": [
"MILL1", "MILL1",
"MILL2" "MILL2"
], ]
"stepNumber": "4"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QEDM" "QEDM"
], ]
"stepNumber": "5"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -167,22 +161,19 @@ ...@@ -167,22 +161,19 @@
}, },
"stationIdsList": [ "stationIdsList": [
"EDM" "EDM"
], ]
"stepNumber": "6"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "7"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"MA1", "MA1",
"MA2", "MA2",
"MA3" "MA3"
], ]
"stepNumber": "8"
} }
] ]
}, },
...@@ -195,14 +186,12 @@ ...@@ -195,14 +186,12 @@
{ {
"stationIdsList": [ "stationIdsList": [
"OD0" "OD0"
], ]
"stepNumber": "0"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QCAM" "QCAM"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -216,14 +205,12 @@ ...@@ -216,14 +205,12 @@
"stationIdsList": [ "stationIdsList": [
"CAM1", "CAM1",
"CAM2" "CAM2"
], ]
"stepNumber": "2"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QMILL" "QMILL"
], ]
"stepNumber": "3"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -237,14 +224,12 @@ ...@@ -237,14 +224,12 @@
"stationIdsList": [ "stationIdsList": [
"MILL1", "MILL1",
"MILL2" "MILL2"
], ]
"stepNumber": "4"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QEDM" "QEDM"
], ]
"stepNumber": "5"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -257,22 +242,19 @@ ...@@ -257,22 +242,19 @@
}, },
"stationIdsList": [ "stationIdsList": [
"EDM" "EDM"
], ]
"stepNumber": "6"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"AB1" "AB1"
], ]
"stepNumber": "7"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"MA1", "MA1",
"MA2", "MA2",
"MA3" "MA3"
], ]
"stepNumber": "8"
} }
] ]
}, },
...@@ -290,14 +272,12 @@ ...@@ -290,14 +272,12 @@
"MA1", "MA1",
"MA2", "MA2",
"MA3" "MA3"
], ]
"stepNumber": "0"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"QIM" "QIM"
], ]
"stepNumber": "1"
}, },
{ {
"processingTime": { "processingTime": {
...@@ -310,14 +290,12 @@ ...@@ -310,14 +290,12 @@
}, },
"stationIdsList": [ "stationIdsList": [
"IM" "IM"
], ]
"stepNumber": "2"
}, },
{ {
"stationIdsList": [ "stationIdsList": [
"E1" "E1"
], ]
"stepNumber": "3"
} }
] ]
} }
......
dream/simulation/JSONInputs/Topology58.json
View file @ 3b04f4a6
This diff is collapsed.
dream/simulation/JSONInputs/Topology59.json
View file @ 3b04f4a6
This diff is collapsed.
dream/simulation/JSONInputs/Topology61.json
View file @ 3b04f4a6
This diff is collapsed.
dream/simulation/JSONInputs/Topology62.json
View file @ 3b04f4a6
This diff is collapsed.
dream/simulation/reformat.py
View file @ 3b04f4a6
...@@ -75,6 +75,9 @@ def format(m): ...@@ -75,6 +75,9 @@ def format(m):
processingTime = r['processingTime'] processingTime = r['processingTime']
if 'mean' in processingTime: if 'mean' in processingTime:
processingTime['mean'] = float(processingTime['mean']) processingTime['mean'] = float(processingTime['mean'])
for component in job.get('componentsList', []):
for r in component['route']:
r.pop("stepNumber", None)
return m return m
......
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