wipStatList to be gathered also for every replication

dream/simulation/CoreObject.py

@@ -88,6 +88,8 @@ class CoreObject(ManPyObject):
                               }
         # flag notifying the the station can deliver entities that ended their processing while interrupted
         self.canDeliverOnInterruption=False
+        # keep wip stats for every replication
+        self.WipStat=[]
                 
     def initialize(self):
         from Globals import G
@@ -660,6 +662,7 @@ class CoreObject(ManPyObject):
         activeObject.Loading.append(100*self.totalLoadTime/MaxSimtime)
         activeObject.SettingUp.append(100*self.totalSetupTime/MaxSimtime)
         activeObject.OffShift.append(100*self.totalOffShiftTime/MaxSimtime)
+        activeObject.WipStat.append(self.wipStatList)
        
     # =======================================================================
     # outputs results to JSON File 

dream/simulation/Queue.py

@@ -62,8 +62,6 @@ class Queue(CoreObject):
               (scheduling_rule, id))
 
         self.gatherWipStat=gatherWipStat
-        # Will be populated by an event generator
-        self.wip_stat_list = []
         # trigger level for the reallocation of operators
         if level:
             assert level<=self.capacity, "the level cannot be bigger than the capacity of the queue"
@@ -326,10 +324,6 @@ class Queue(CoreObject):
                 'id': str(self.id), 
                 'family': self.family,
                 'results': {} }
-        # XXX this have to be updated to support multiple generations
-#         if G.numberOfReplications == 1 and self.wip_stat_list:
-#           json['wip_stat_list'] = self.wip_stat_list
-        # XXX this have to be updated to support multiple generations
-        if G.numberOfReplications == 1 and self.gatherWipStat:
-            json['results']['wip_stat_list']=self.wipStatList
+        if self.gatherWipStat:
+            json['results']['wip_stat_list']=self.WipStat
         G.outputJSON['elementList'].append(json)