Commit 5fa377f1 authored by Georgios Dagkakis's avatar Georgios Dagkakis

further check in Machine.run

parent 84bea9fa
......@@ -543,6 +543,7 @@ class Machine(CoreObject):
# =======================================================================
def run(self):
# request for allocation if needed
from Globals import G
self.initialAllocationRequest()
# execute all through simulation time
while 1:
......@@ -578,6 +579,11 @@ class Machine(CoreObject):
self.interruptionEnd=self.env.event()
# try to signal the Giver, otherwise wait until it is requested
if self.signalGiver():
# XXX cleaner implementation needed
# if there is skilled router the giver should also check
if G.Router:
if 'Skilled' in str(G.Router.__class__):
continue
break
if self.loadOperatorAvailable in receivedEvent:
transmitter, eventTime=self.loadOperatorAvailable.value
......@@ -586,7 +592,6 @@ class Machine(CoreObject):
self.loadOperatorAvailable=self.env.event()
# try to signal the Giver, otherwise wait until it is requested
if self.signalGiver():
from Globals import G
# XXX cleaner implementation needed
# if there is router that is not skilled break
if G.Router:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment