ants to be evaluated based also on units that lie in the decomposition before the exit

dream/plugins/Batches/BatchesACO.py

@@ -28,6 +28,12 @@ class BatchesACO(ACO):
                 unitsThroughput=unitsThroughput[0]
             if not unitsThroughput:
                 unitsThroughput=element['results']['throughput'][0]
+            # below checking the predecessors of exit. If a predecessor is reassembly and 
+            # has WIP add this also in the throughput
+            for objectId in self.getPredecessors(ant['input'], element['id']):
+                for record in result['elementList']:
+                    if record['id']==objectId and 'Reassembly' in record['_class']:
+                        unitsThroughput+=record['results'].get('final_WIP',[0])[0]
     # return the negative value since they are ranked this way. XXX discuss this
     return -unitsThroughput
 

dream/plugins/Batches/BatchesStochasticACO.py

@@ -64,6 +64,14 @@ class BatchesStochasticACO(BatchesACO):
         #id the class is Exit get the unitsThroughput
         if element_family == 'Exit':
             unitsThroughput=element['results'].get('unitsThroughput',None)
+            # below checking the predecessors of exit. If a predecessor is reassembly and 
+            # has WIP add this also in the throughput
+            for objectId in self.getPredecessors(ant['input'], element['id']):
+                for record in result['elementList']:
+                    if record['id']==objectId and 'Reassembly' in record['_class']:
+                        finalWIPList=record['results'].get('final_WIP',[0])
+                        for i in range(len(finalWIPList)):
+                            unitsThroughput[i]+=finalWIPList[i]     
             self.outputSheet.write(self.rowIndex,2,'Units Throughput Per Replication')
             col=3
             for element in unitsThroughput: