correction in last commit, we want to output lists and not CIs

dream/simulation/Assembly.py

@@ -433,8 +433,8 @@ class Assembly(CoreObject):
         json = {'_class': self.class_name,
                 'id': self.id,
                 'results': {}}
-        json['results']['working_ratio'] = getConfidenceIntervals(self.Working)
-        json['results']['blockage_ratio'] = getConfidenceIntervals(self.Blockage)
-        json['results']['waiting_ratio'] = getConfidenceIntervals(self.Waiting)
+        json['results']['working_ratio'] = self.Working
+        json['results']['blockage_ratio'] = self.Blockage
+        json['results']['waiting_ratio'] = self.Waiting
 
         G.outputJSON['elementList'].append(json)

dream/simulation/BatchReassembly.py

@@ -341,11 +341,11 @@ class BatchReassembly(CoreObject):
                     'id': self.id,
                     'family': self.family,
                     'results': {}}
-            json['results']['failure_ratio'] = getConfidenceIntervals(self.Failure)
-            json['results']['working_ratio'] = getConfidenceIntervals(self.Working)
-            json['results']['blockage_ratio'] = getConfidenceIntervals(self.Blockage)
-            json['results']['waiting_ratio'] = getConfidenceIntervals(self.Waiting)
-            json['results']['off_shift_ratio'] = getConfidenceIntervals(self.OffShift)
+            json['results']['failure_ratio'] = self.Failure
+            json['results']['working_ratio'] = self.Working
+            json['results']['blockage_ratio'] = self.Blockage
+            json['results']['waiting_ratio'] = self.Waiting
+            json['results']['off_shift_ratio'] = self.OffShift
             G.outputJSON['elementList'].append(json)
         
         

dream/simulation/Conveyer.py

@@ -496,9 +496,9 @@ class Conveyer(CoreObject):
         json = {'_class': self.class_name,
                 'id': self.id,
                 'results': {}}
-        json['results']['working_ratio'] = getConfidenceIntervals(self.Working)
-        json['results']['blockage_ratio'] = getConfidenceIntervals(self.Blockage)
-        json['results']['waiting_ratio'] = getConfidenceIntervals(self.Waiting)
+        json['results']['working_ratio'] = self.Working
+        json['results']['blockage_ratio'] = self.Blockage
+        json['results']['waiting_ratio'] = self.Waiting
 
         G.outputJSON['elementList'].append(json)
 

dream/simulation/Dismantle.py

@@ -370,7 +370,7 @@ class Dismantle(CoreObject):
         json = {'_class': self.class_name,
                 'id': self.id,
                 'results': {}}
-        json['results']['working_ratio'] = getConfidenceIntervals(self.Working)
-        json['results']['blockage_ratio'] = getConfidenceIntervals(self.Blockage)
-        json['results']['waiting_ratio'] = getConfidenceIntervals(self.Waiting)
+        json['results']['working_ratio'] = self.Working
+        json['results']['blockage_ratio'] = self.Blockage
+        json['results']['waiting_ratio'] = self.Waiting
         G.outputJSON['elementList'].append(json)

dream/simulation/Exit.py

@@ -221,10 +221,9 @@ class Exit(CoreObject):
                   'id': self.id,
                   'family': self.family,
                   'results': {} }
-        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
         G.outputJSON['elementList'].append(json)

dream/simulation/Operator.py

@@ -324,9 +324,9 @@ class Operator(ObjectResource):
                 'id': self.id,
                 'family': self.family,
                 'results': {}}
-        json['results']['working_ratio'] = getConfidenceIntervals(self.Working)
-        json['results']['waiting_ratio'] = getConfidenceIntervals(self.Waiting)
-        json['results']['off_shift_ratio'] = getConfidenceIntervals(self.OffShift)
+        json['results']['working_ratio'] = self.Working
+        json['results']['waiting_ratio'] = self.Waiting
+        json['results']['off_shift_ratio'] = self.OffShift
         if self.ouputSchedule:
             if self.schedule:
                 json['results']['schedule']=[]