setWIP updated to use expectedSignals

6ddc0faa · Ioannis Papagiannopoulos · Georgios Dagkakis · 5a8adb90 · 6ddc0faa
Commit 6ddc0faa authored Sep 09, 2014 by Ioannis Papagiannopoulos Committed by Georgios Dagkakis Nov 03, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

dream/simulation/Globals.py dream/simulation/Globals.py +6 -4

No files found.
--- a/dream/simulation/Globals.py
+++ b/dream/simulation/Globals.py
@@ -280,8 +280,9 @@ 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:
-                    succeedTuple=(G.env,G.env.now)
+                    if entity.currentStation.expectedSignals['canDispose']:
-                    entity.currentStation.canDispose.succeed(succeedTuple)   
+                        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
        # TODO, maybe use 'class_family attribute here'
        if G.env.now==0 and entity.currentStation:
@@ -292,8 +293,9 @@ 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):
-                        succeedTuple=(G.env,G.env.now)
+                        if entity.currentStation.expectedSignals['initialWIP']:
-                        entity.currentStation.initialWIP.succeed(succeedTuple)
+                            succeedTuple=(G.env,G.env.now)
+                            entity.currentStation.initialWIP.succeed(succeedTuple)
 def countIntervalThroughput():