Skip to content

dream
dream
Commit 5eddc6ac authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

interarrivalTime.mean is now a float 

TODO: the GUI will have to make it a float too
parent fd62846b
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 47 deletions
dream/simulation/JSONInputs/Topology01.json
View file @ 5eddc6ac
......@@ -101,7 +101,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.6968085106382979,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology02.json
View file @ 5eddc6ac
......@@ -67,7 +67,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.7857142857142857,
"name": "Parts",
......@@ -78,7 +78,7 @@
"entity": "Dream.Frame",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "2"
"mean": 2.0
},
"left": 0.2142857142857143,
"name": "Frames",
......
dream/simulation/JSONInputs/Topology03.json
View file @ 5eddc6ac
......@@ -88,7 +88,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.30208333333333337,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology04.json
View file @ 5eddc6ac
......@@ -102,7 +102,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.6979166666666667,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology05.json
View file @ 5eddc6ac
......@@ -100,7 +100,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.2142857142857143,
"name": "Parts",
......@@ -111,7 +111,7 @@
"entity": "Dream.Frame",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "2"
"mean": 2.0
},
"left": 0.7857142857142857,
"name": "Frames",
......
dream/simulation/JSONInputs/Topology06.json
View file @ 5eddc6ac
......@@ -120,7 +120,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.6979166666666667,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology07.json
View file @ 5eddc6ac
......@@ -104,7 +104,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.7857142857142857,
"name": "Raw Material 1",
......@@ -115,7 +115,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.2142857142857143,
"name": "Raw Material 2",
......
dream/simulation/JSONInputs/Topology08.json
View file @ 5eddc6ac
......@@ -121,7 +121,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.8636363636363636,
"name": "Raw Material 1",
......@@ -132,7 +132,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.13636363636363635,
"name": "Raw Material 2",
......@@ -143,7 +143,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "2"
"mean": 2.0
},
"left": 0.5,
"name": "Raw Material 3",
......
dream/simulation/JSONInputs/Topology09.json
View file @ 5eddc6ac
......@@ -44,7 +44,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.5,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology10.json
View file @ 5eddc6ac
......@@ -121,7 +121,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.7857142857142857,
"name": "Raw Material 1",
......@@ -132,7 +132,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.2142857142857143,
"name": "Raw Material 2",
......
dream/simulation/JSONInputs/Topology11.json
View file @ 5eddc6ac
......@@ -116,7 +116,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.639751552795031,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology12.json
View file @ 5eddc6ac
......@@ -153,7 +153,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.639751552795031,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology13.json
View file @ 5eddc6ac
......@@ -101,7 +101,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.2142857142857143,
"name": "Parts",
......@@ -112,7 +112,7 @@
"entity": "Dream.Frame",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "2"
"mean": 2.0
},
"left": 0.7857142857142857,
"name": "Frames",
......
dream/simulation/JSONInputs/Topology14.json
View file @ 5eddc6ac
......@@ -153,7 +153,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.2142857142857143,
"name": "Parts",
......@@ -164,7 +164,7 @@
"entity": "Dream.Frame",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "2"
"mean": 2.0
},
"left": 0.7857142857142857,
"name": "Frames",
......
dream/simulation/JSONInputs/Topology15.json
View file @ 5eddc6ac
......@@ -102,7 +102,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.30208333333333337,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology16.json
View file @ 5eddc6ac
......@@ -120,7 +120,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.30208333333333337,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology17.json
View file @ 5eddc6ac
......@@ -88,7 +88,7 @@
"id": "S1",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"name": "Raw Material"
}
......
dream/simulation/JSONInputs/Topology21.json
View file @ 5eddc6ac
......@@ -71,7 +71,7 @@
"entity": "Dream.Batch",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.6968085106382979,
"name": "Source",
......
dream/simulation/JSONInputs/Topology22.json
View file @ 5eddc6ac
......@@ -131,7 +131,7 @@
"entity": "Dream.Batch",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1.5"
"mean": 1.5
},
"left": 0.6968085106382979,
"name": "Source",
......
dream/simulation/JSONInputs/Topology23.json
View file @ 5eddc6ac
......@@ -129,7 +129,7 @@
"entity": "Dream.Batch",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1.5"
"mean": 1.5
},
"left": 0.6968085106382979,
"name": "Source",
......
dream/simulation/JSONInputs/Topology24.json
View file @ 5eddc6ac
......@@ -87,7 +87,7 @@
"id": "S1",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "30"
"mean": 30.0
},
"name": "Raw Material"
}
......
dream/simulation/JSONInputs/Topology25.json
View file @ 5eddc6ac
......@@ -155,7 +155,7 @@
"entity": "Dream.Batch",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.6968085106382979,
"name": "Source",
......
dream/simulation/JSONInputs/Topology27.json
View file @ 5eddc6ac
......@@ -92,7 +92,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.6968085106382979,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology28.json
View file @ 5eddc6ac
......@@ -77,7 +77,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1.5"
"mean": 1.5
},
"left": 0.30208333333333337,
"name": "Source",
......
dream/simulation/JSONInputs/Topology31.json
View file @ 5eddc6ac
......@@ -98,7 +98,7 @@
"id": "S1",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"name": "Raw Material"
},
......
dream/simulation/JSONInputs/Topology32.json
View file @ 5eddc6ac
......@@ -95,7 +95,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.6968085106382979,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology33.json
View file @ 5eddc6ac
......@@ -153,7 +153,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.639751552795031,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology36.json
View file @ 5eddc6ac
......@@ -60,7 +60,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.5"
"mean": 0.5
},
"left": 0.5,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology42.json
View file @ 5eddc6ac
......@@ -80,7 +80,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "6"
"mean": 6.0
},
"name": "Source"
}
......
dream/simulation/JSONInputs/Topology48.json
View file @ 5eddc6ac
......@@ -139,7 +139,7 @@
"entity": "Dream.Batch",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1.5"
"mean": 1.5
},
"left": 0.6968085106382979,
"name": "Source",
......
dream/simulation/JSONInputs/Topology49.json
View file @ 5eddc6ac
......@@ -58,7 +58,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.5,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology50.json
View file @ 5eddc6ac
......@@ -58,7 +58,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.5,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology51.json
View file @ 5eddc6ac
......@@ -58,7 +58,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.5,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology52.json
View file @ 5eddc6ac
......@@ -58,7 +58,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.5,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology53.json
View file @ 5eddc6ac
......@@ -58,7 +58,7 @@
"entity": "Dream.Part",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "1"
"mean": 1.0
},
"left": 0.5,
"name": "Raw Material",
......
dream/simulation/JSONInputs/Topology54.json
View file @ 5eddc6ac
......@@ -95,7 +95,7 @@
"id": "S1",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.75"
"mean": 0.75
},
"name": "Raw Material"
}
......
dream/simulation/JSONInputs/Topology55.json
View file @ 5eddc6ac
......@@ -95,7 +95,7 @@
"id": "S1",
"interarrivalTime": {
"distributionType": "Fixed",
"mean": "0.75"
"mean": 0.75
},
"name": "Raw Material"
}
......
dream/simulation/reformat.py
View file @ 5eddc6ac
......@@ -58,7 +58,9 @@ def positionGraph(g):
def format(m):
for node in m['nodes'].values():
if node['_class'] in ('Dream.Source', 'Dream.BatchSource'):
print node
interarrivalTime = node['interarrivalTime']
print interarrivalTime
interarrivalTime['mean'] = float(interarrivalTime['mean'])
entity = node['entity']
if not entity.startswith('Dream.'):
node['entity'] = 'Dream.%s' % entity
......@@ -68,7 +70,7 @@ def format(m):
with open(sys.argv[1]) as infile:
m = json.load(infile)
#m.update(format(m))
m.update(format(m))
#m.update(preferences=positionGraph(m))
with open(sys.argv[1], "w") as outfile:
......
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