setWIP updated to use expectedSignals

dream/simulation/Globals.py

@@ -280,6 +280,7 @@ def setWIP(entityList):
             if issubclass(entity.currentStation.__class__, Queue):
                 # send the signal only if it is not already triggered
                 if not entity.currentStation.canDispose.triggered:
+                    if entity.currentStation.expectedSignals['canDispose']:
                         succeedTuple=(G.env,G.env.now)
                         entity.currentStation.canDispose.succeed(succeedTuple)   
         # if we are in the start of the simulation the object is of server type then we should send initialWIP signal
@@ -292,6 +293,7 @@ def setWIP(entityList):
                     # trigger initialWIP event only if it has not been triggered. Otherwise
                     # if we set more than one entities (e.g. in reassembly) it will crash
                     if not (entity.currentStation.initialWIP.triggered):
+                        if entity.currentStation.expectedSignals['initialWIP']:
                             succeedTuple=(G.env,G.env.now)
                             entity.currentStation.initialWIP.succeed(succeedTuple)