Exit reverted to output confidence intervals in multiple runs

dream/simulation/Exit.py

@@ -228,15 +228,15 @@ class Exit(CoreObject):
             json['results']['lifespan']=self.Lifespan[0]
             json['results']['takt_time']=self.TaktTime[0]
         else:
-            json['results']['throughput'] =self.Exits
-            json['results']['lifespan'] = self.Lifespan
-            json['results']['takt_time'] = self.TaktTime
-            if self.Exits!=self.UnitExits:      #output this only if there was variability in units
-                json['results']['unitsThroughput'] = self.UnitExits
-#             json['results']['throughput'] = getConfidenceIntervals(self.Exits)
-#             json['results']['lifespan'] = getConfidenceIntervals(self.Lifespan)
-#             json['results']['takt_time'] = getConfidenceIntervals(self.TaktTime)
+#             json['results']['throughput'] =self.Exits
+#             json['results']['lifespan'] = self.Lifespan
+#             json['results']['takt_time'] = self.TaktTime
 #             if self.Exits!=self.UnitExits:      #output this only if there was variability in units
-#                 json['results']['unitsThroughput'] = getConfidenceIntervals(self.UnitExits)
+#                 json['results']['unitsThroughput'] = self.UnitExits
+            json['results']['throughput'] = getConfidenceIntervals(self.Exits)
+            json['results']['lifespan'] = getConfidenceIntervals(self.Lifespan)
+            json['results']['takt_time'] = getConfidenceIntervals(self.TaktTime)
+            if self.Exits!=self.UnitExits:      #output this only if there was variability in units
+                json['results']['unitsThroughput'] = getConfidenceIntervals(self.UnitExits)
 
         G.outputJSON['elementList'].append(json)

dream/tests/dump/Topology63.json.result

@@ -5,24 +5,21 @@
    "_class": "Dream.Exit", 
    "id": "E1", 
    "results": {
-    "lifespan": [
-     2.6669019802211222, 
-     7.595290030987388, 
-     11.316781137761925, 
-     5.228892279245487
-    ], 
-    "takt_time": [
-     1.6041865530589627, 
-     1.6625466007459841, 
-     1.7552468099668836, 
-     1.6108553725392574
-    ], 
-    "throughput": [
-     31, 
-     30, 
-     28, 
-     31
-    ]
+    "lifespan": {
+     "avg": 6.701966357053981, 
+     "lb": 5.295967571611044, 
+     "ub": 8.107965142496917
+    }, 
+    "takt_time": {
+     "avg": 1.6582088340777719, 
+     "lb": 1.6315325244963546, 
+     "ub": 1.6848851436591892
+    }, 
+    "throughput": {
+     "avg": 30.0, 
+     "lb": 29.45913944770772, 
+     "ub": 30.54086055229228
+    }
    }
   }, 
   {