Commit a42305c0 authored by Georgios Dagkakis's avatar Georgios Dagkakis

ObjectInterruptions to be activated first and then CoreObjects

parent 8d8415ce
...@@ -444,7 +444,10 @@ def runSimulation(objectList=[], maxSimTime=100, numberOfReplications=1, trace=' ...@@ -444,7 +444,10 @@ def runSimulation(objectList=[], maxSimTime=100, numberOfReplications=1, trace='
object.initialize() object.initialize()
#activate all the objects #activate all the objects
for object in G.ObjList + G.ObjectInterruptionList: for object in G.ObjectInterruptionList:
G.env.process(object.run())
#activate all the objects
for object in G.ObjList:
G.env.process(object.run()) G.env.process(object.run())
#set the WIP #set the WIP
......
...@@ -483,9 +483,10 @@ def initializeObjects(): ...@@ -483,9 +483,10 @@ def initializeObjects():
# activates all the objects # activates all the objects
# =========================================================================== # ===========================================================================
def activateObjects(): def activateObjects():
# XXX EventGeneratorList for element in G.ObjectInterruptionList:
for element in G.ObjList + G.ObjectInterruptionList: G.env.process(element.run())
G.env.process(element.run()) for element in G.ObjList:
G.env.process(element.run())
# =========================================================================== # ===========================================================================
# the main script that is ran # the main script that is ran
......
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