Correction in M3

0cc93ef5 · Georgios Dagkakis · c22b83bf · 0cc93ef5
Commit 0cc93ef5 authored Oct 08, 2014 by Georgios Dagkakis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

dream/simulation/M3.py dream/simulation/M3.py +2 -1

No files found.
--- a/dream/simulation/M3.py
+++ b/dream/simulation/M3.py
@@ -39,7 +39,8 @@ class M3(BatchScrapMachine):
    def canAcceptAndIsRequested(self, callerObject=None):
        nextObject=self.next[0]
        if len(nextObject.getActiveObjectQueue())>0:
-            if nextObject.getActiveObjectQueue()[0].type=='Batch':
+            if nextObject.getActiveObjectQueue()[0].type=='Batch' or\
+                len(nextObject.getActiveObjectQueue())==nextObject.numberOfSubBatches:
                return False
        return BatchScrapMachine.canAcceptAndIsRequested(self, callerObject)