interarrivalTime.mean is now a float

TODO: the GUI will have to make it a float too

dream/simulation/JSONInputs/Topology01.json

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -88,7 +88,7 @@
             "id": "S1",
             "interarrivalTime": {
                 "distributionType": "Fixed",
-                "mean": "0.5"
+                "mean": 0.5
             },
             "name": "Raw Material"
         }

dream/simulation/JSONInputs/Topology21.json

@@ -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

@@ -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

@@ -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

@@ -87,7 +87,7 @@
             "id": "S1",
             "interarrivalTime": {
                 "distributionType": "Fixed",
-                "mean": "30"
+                "mean": 30.0
             },
             "name": "Raw Material"
         }

dream/simulation/JSONInputs/Topology25.json

@@ -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

@@ -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

@@ -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

@@ -98,7 +98,7 @@
             "id": "S1",
             "interarrivalTime": {
                 "distributionType": "Fixed",
-                "mean": "0.5"
+                "mean": 0.5
             },
             "name": "Raw Material"
         },

dream/simulation/JSONInputs/Topology32.json

@@ -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

@@ -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

@@ -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

@@ -80,7 +80,7 @@
             "entity": "Dream.Part",
             "interarrivalTime": {
                 "distributionType": "Fixed",
-                "mean": "6"
+                "mean": 6.0
             },
             "name": "Source"
         }

dream/simulation/JSONInputs/Topology48.json

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -95,7 +95,7 @@
             "id": "S1",
             "interarrivalTime": {
                 "distributionType": "Fixed",
-                "mean": "0.75"
+                "mean": 0.75
             },
             "name": "Raw Material"
         }

dream/simulation/JSONInputs/Topology55.json

@@ -95,7 +95,7 @@
             "id": "S1",
             "interarrivalTime": {
                 "distributionType": "Fixed",
-                "mean": "0.75"
+                "mean": 0.75
             },
             "name": "Raw Material"
         }

dream/simulation/reformat.py

@@ -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: