BatchDecomposition/Reassembly corrected

dream/simulation/BatchDecomposition.py

@@ -129,6 +129,7 @@ class BatchDecomposition(CoreObject):
             # if the activeEntity is in the pendingEntities list then place the subBatches there
             if activeEntity in G.pendingEntities:
                 G.pendingEntities.append(subBatch)
+                G.pendingEntities.remove(activeEntity)
         activeEntity.numberOfSubBatches=self.numberOfSubBatches  
         self.timeLastEntityEnded=now()
 

dream/simulation/BatchReassembly.py

@@ -125,6 +125,8 @@ class BatchReassembly(CoreObject):
         # if the activeEntity is in the pendingEntities list then place the subBatches there
         if activeObjectQueue[0] in G.pendingEntities:
             G.pendingEntities.append(batchToBeReassembled)
+            for entity in activeObjectQueue:
+                G.pendingEntities.remove(entity)
         
         del activeObjectQueue[:]
         batchToBeReassembled.numberOfSubBatches = 1