jobShop objects make use of expectedSignals dict

dream/simulation/MachineJobShop.py

@@ -292,8 +292,9 @@ class MachineJobShop(Machine):
         self.receiver.timeLastEntityEnded=self.env.now     #required to count blockage correctly in the preemptied station
         # TODO: use a signal and wait for it, reactivation is not recognised as interruption
 #         reactivate(self)
-        succeedTuple=(self,self.env.now)
-        self.preemptQueue.succeed(succeedTuple)
+        if self.expectedSignals['preemptQueue']:
+            succeedTuple=(self,self.env.now)
+            self.preemptQueue.succeed(succeedTuple)
         # TODO: consider the case when a failure has the Station down. The event preempt will not be received now()
         #     but at a later simulation time. 
             

dream/simulation/MouldAssemblyBuffer.py

@@ -110,8 +110,9 @@ class MouldAssemblyBuffer(QueueManagedJob):
                 for secondary in [x for x in activeEntity.order.secondaryComponentsList if activeEntity.order.basicsEnded]:
                     if secondary.currentStation.__class__.__name__=='ConditionalBuffer':
 #                         print now(), self.id, '                                                    signalling conditional buffer'
-                        succeedTuple=(self,self.env.now)
-                        secondary.currentStation.canDispose.succeed(succeedTuple)
+                        if secondary.currentStation.expectedSignals['canDispose']:
+                            succeedTuple=(self,self.env.now)
+                            secondary.currentStation.canDispose.succeed(succeedTuple)
                         break
             # for all the components that have the same parent Order as the activeEntity
             activeEntity.order.componentsReadyForAssembly = 1

dream/simulation/OrderDecomposition.py

@@ -72,6 +72,10 @@ class OrderDecomposition(CoreObject):
         self.initialSignalReceiver()
         while 1:  
             #wait until the Queue can accept an entity and one predecessor requests it
+            
+            self.expectedSignals['isRequested']=1
+            self.expectedSignals['canDispose']=1
+            
             receivedEvent=yield self.env.any_of([self.isRequested , self.canDispose])
             # if the event that activated the thread is isRequested then getEntity
             if self.isRequested in receivedEvent:
@@ -84,6 +88,10 @@ class OrderDecomposition(CoreObject):
             if self.canDispose in receivedEvent:
                 transmitter, eventTime=self.canDispose.value
                 self.canDispose=self.env.event()
+            
+            self.expectedSignals['isRequested']=0
+            self.expectedSignals['canDispose']=0
+            
             # if the event that activated the thread is canDispose then signalReceiver
             if self.haveToDispose():
 #                 print now(), self.id, 'will try to signal a receiver from generator'