level attribute and control moved to Queue

dream/simulation/Queue.py

@@ -37,7 +37,7 @@ class Queue(CoreObject):
     #===========================================================================
     # the __init__ method of the Queue
     #===========================================================================
-    def __init__(self, id, name, capacity=1, isDummy=False, schedulingRule="FIFO", gatherWipStat=False):
+    def __init__(self, id, name, capacity=1, isDummy=False, schedulingRule="FIFO", level=None, gatherWipStat=False):
         CoreObject.__init__(self, id, name)
 #         Process.__init__(self)
         # used for the routing of the entities
@@ -69,6 +69,10 @@ class Queue(CoreObject):
         self.gatherWipStat=gatherWipStat
         # Will be populated by an event generator
         self.wip_stat_list = []
+        # trigger level for the reallocation of operators
+        if level:
+            assert level<=self.capacity, "the level cannot be bigger than the capacity of the queue"
+        self.level=level
 
     @staticmethod
     def getSupportedSchedulingRules():
@@ -166,6 +170,16 @@ class Queue(CoreObject):
             if self.haveToDispose():
 #                 self.printTrace(self.id, attemptSignalReceiver='(removeEntity)')
                 self.signalReceiver()
+        # check if the queue is empty, if yes then try to signal the router, operators may need reallocation
+        try:
+            if self.level:
+                if not len(self.getActiveObjectQueue()):
+                    from Globals import G
+                    if not G.Router.invoked:
+                        G.Router.invoked=True
+                        G.Router.isCalled.succeed(G.env.now)
+        except:
+            pass
         return activeEntity
     
     # =======================================================================
@@ -185,6 +199,16 @@ class Queue(CoreObject):
     # =======================================================================     
     def getEntity(self):
         activeEntity=CoreObject.getEntity(self)  #run the default behavior 
+        # if the level is reached then try to signal the Router to reallocate the operators
+        try:
+            if self.level:
+                if len(self.getActiveObjectQueue())==self.level:
+                    from Globals import G
+                    if not G.Router.invoked:
+                        G.Router.invoked=True
+                        G.Router.isCalled.succeed(G.env.now)
+        except:
+            pass
         return activeEntity
     
     #===========================================================================

dream/simulation/RoutingQueue.py

@@ -33,14 +33,14 @@ from Queue import Queue
 #                            the Queue object
 # ===========================================================================
 class RoutingQueue(Queue):
-    #===========================================================================
-    # the __init__ method of the Queue
-    #===========================================================================
-    def __init__(self, id, name, capacity=1, isDummy=False, schedulingRule="FIFO", gatherWipStat=False,level=None):
-        Queue.__init__(self, id, name,capacity,isDummy,schedulingRule,gatherWipStat)
-        if level:
-            assert level<=self.capacity, "the level cannot be bigger than the capacity of the queue"
-        self.level=level
+#     #===========================================================================
+#     # the __init__ method of the Queue
+#     #===========================================================================
+#     def __init__(self, id, name, capacity=1, isDummy=False, schedulingRule="FIFO", gatherWipStat=False,level=None):
+#         Queue.__init__(self, id, name,capacity,isDummy,schedulingRule,gatherWipStat)
+#         if level:
+#             assert level<=self.capacity, "the level cannot be bigger than the capacity of the queue"
+#         self.level=level
     
     # =======================================================================
     #    checks if the Queue can dispose an entity to the following object
@@ -83,22 +83,22 @@ class RoutingQueue(Queue):
                 entity.receiver=receiver
         activeObjectQueue.sort(key=lambda x: x.receiver==receiver, reverse=True)
     
-    # =======================================================================
-    #                    removes an entity from the Object
-    # =======================================================================
-    def removeEntity(self, entity=None):
-        activeEntity=Queue.removeEntity(self, entity)                  #run the default method
-        # check if the queue is empty, if yes then try to signal the router, operators may need reallocation
-        try:
-            if self.level:
-                if not len(self.getActiveObjectQueue()):
-                    from Globals import G
-                    if not G.Router.invoked:
-                        G.Router.invoked=True
-                        G.Router.isCalled.succeed(G.env.now)
-        except:
-            pass
-        return activeEntity
+#     # =======================================================================
+#     #                    removes an entity from the Object
+#     # =======================================================================
+#     def removeEntity(self, entity=None):
+#         activeEntity=Queue.removeEntity(self, entity)                  #run the default method
+#         # check if the queue is empty, if yes then try to signal the router, operators may need reallocation
+#         try:
+#             if self.level:
+#                 if not len(self.getActiveObjectQueue()):
+#                     from Globals import G
+#                     if not G.Router.invoked:
+#                         G.Router.invoked=True
+#                         G.Router.isCalled.succeed(G.env.now)
+#         except:
+#             pass
+#         return activeEntity
     
     # =======================================================================
     #            gets an entity from the predecessor that 
@@ -117,16 +117,16 @@ class RoutingQueue(Queue):
         # if none of the siblings (same parentBatch) has gone through the buffer then the receiver should remain None 
         except:
             pass
-        # if the level is reached then try to signal the Router to reallocate the operators
-        try:
-            if self.level:
-                if len(self.getActiveObjectQueue())==self.level:
-                    from Globals import G
-                    if not G.Router.invoked:
-                        G.Router.invoked=True
-                        G.Router.isCalled.succeed(G.env.now)
-        except:
-            pass
+#         # if the level is reached then try to signal the Router to reallocate the operators
+#         try:
+#             if self.level:
+#                 if len(self.getActiveObjectQueue())==self.level:
+#                     from Globals import G
+#                     if not G.Router.invoked:
+#                         G.Router.invoked=True
+#                         G.Router.isCalled.succeed(G.env.now)
+#         except:
+#             pass
         return activeEntity
     
     # =======================================================================