Router clean-up, finding candididateStations for the operators

dream/simulation/Operator.py

@@ -95,6 +95,12 @@ class Operator(ObjectResource):
     def isAssignedTo(self):
         return self.operatorAssignedTo
     
+    #===========================================================================
+    # check whether the operator has only one candidateStation to work for
+    #===========================================================================
+    def hasOneOption(self):
+        return len(self.candidateStations)==1
+    
     # =======================================================================
     #    sorts the candidateEntities of the Operator according to the scheduling rule
     # TODO: find a way to sort machines or candidate entities for machines, 

dream/simulation/OperatorManagedJob.py

@@ -86,6 +86,27 @@ class OperatorManagedJob(Operator):
 #     def isAssignedTo(self):
 #         return self.operatorAssignedTo
         
+    #=======================================================================
+    # findCandidateEntities method finding the candidateEntities of the operator  
+    #=======================================================================
+    def findCandidateEntities(self):
+#         print 'trying to import G'
+        from Globals import G
+        router=G.Router
+        if router.pending:
+            print now(), self.id
+            for entity in [x for x in router.pending if x.canProceed and x.manager==self]:
+                self.candidateEntities.append(entity)
+            print '    ', [x.id for x in self.candidateEntities]
+        
+    #===========================================================================
+    # check if the operator has only one station as candidate option
+    #===========================================================================
+    def hasOneOption(self):
+        if len(self.candidateEntities)==1:
+            # if the candidate entity has only one receiver then return True
+            return len(self.candidateEntities[0].candidateReceivers)==1
+    
     # =======================================================================
     #    sorts the candidateEntities of the Operator according to the scheduling rule
     #     TODO: maybe the argument is not needed. the candidate entities is a variable of the object

dream/simulation/OperatorRouter.py

@@ -130,7 +130,7 @@ class Router(ObjectInterruption):
             if self.sorting:
                 self.sortPendingEntities()
             # find the operators candidateEntities
-            self.findCandidateEntities()
+            self.sortCandidateEntities()
             # find the entity that will occupy the resource, and the station that will receive it (if any available)
             #  entities that are already in stations have already a receiver
             self.findCandidateReceivers()
@@ -354,7 +354,7 @@ class Router(ObjectInterruption):
     #========================================================================
     def findCandidateOperators(self):
         #TODO: here check the case of no managed entities (normal machines)
-        from Globals import G
+#         from Globals import G
         # if we are not dealing with managed entities
         #------------------------------------------------------------------------------ 
         if not self.managed:
@@ -412,6 +412,8 @@ class Router(ObjectInterruption):
                 # update the schedulingRule/multipleCriterionList of the Router
                 if self.sorting:
                     self.updateSchedulingRule()
+                    
+                self.findCandidateEntities()
         #=======================================================================
 #         # testing
 #         print 'router found candidate operators'
@@ -421,6 +423,19 @@ class Router(ObjectInterruption):
 #             print [(operator.id, [station.id for station in operator.candidateStations]) for operator in self.candidateOperators]
         #=======================================================================
     
+    #===========================================================================
+    # find the candidate entities for each candidateOperator
+    #===========================================================================
+    def findCandidateEntities(self):
+        for operator in self.candidateOperators:
+#             print now(), operator.id
+            # find which pendingEntities that can move to machines is the operator managing
+#             operator.findCandidateEntities()
+            for entity in [x for x in self.pending if x.canProceed and x.manager==operator]:
+                operator.candidateEntities.append(entity)
+#             print '    ', [x.id for x in operator.candidateEntities]
+            
+    
     #=======================================================================
     # find the schedulingRules of the candidateOperators
     #=======================================================================
@@ -446,57 +461,18 @@ class Router(ObjectInterruption):
     #     to the scheduling rules of the operator and choose an entity that will be served
     #     and by which machines
     #=======================================================================
-    def findCandidateEntities(self):
+    def sortCandidateEntities(self):
         from Globals import G
-        # if the moving entities are not managed
-        #------------------------------------------------------------------------------ 
-        if not self.managed:
-            # TODO: the operator finds no entities in this case
-            # initialise operatorsWithOneCandidateStation lists
-            operatorsWithOneCandidateStation=[]
-            # for all the candidateOperators
-            for operator in self.candidateOperators:
-            # sort the candidate operators so that those who have only one option be served first
-                if len(operator.candidateStations)==1:
-                    operatorsWithOneCandidateStation.append(operator)
-             
-            # TODO: the operator here actually chooses entity. This may pose a problem as two entities may be equivalent
-            #       and as the operators chooses the sorting of the queue (if they do reside in the same queue is not taken into account)
-            # sort the candidateEntities list of each operator according to its schedulingRule
-            # TODO: rename the sorting method, the simple operator is not sorting entities but candidateStations
-            for operator in [x for x in self.candidateOperators if x.candidateStations]:
-                operator.sortCandidateEntities()
-                 
-            # if there operators that have only one option then sort the candidateOperators according to the first one of these
-            # TODO: find out what happens if there are many operators with one option
-            # TODO: incorporate that to 
-            # self.sortOperators() 
-             
-            if self.sorting:
-                # sort the operators according to their waiting time
-                self.candidateOperators.sort(key=lambda x: x.totalWorkingTime)
-                # sort according to the number of options
-                if operatorsWithOneCandidateStation:
-                    self.candidateOperators.sort(key=lambda x: x in operatorsWithOneCandidateStation, reverse=True)
-        # if the entities are managed
-        #------------------------------------------------------------------------------
-        else:
         # TODO: sort according to the number of pending Jobs
         # TODO Have to sort again according to the priority used by the operators
         
         # initialise the operatorsWithOneOption and operatorsWithOneCandidateEntity lists
         operatorsWithOneOption=[]
-            operatorsWithOneCandidateEntity=[]
         # for all the candidateOperators
         for operator in self.candidateOperators:
-                # find which pendingEntities that can move to machines is the operator managing
-                for entity in [x for x in self.pending if x.canProceed and x.manager==operator]:
-                    operator.candidateEntities.append(entity)
         # sort the candidate operators so that those who have only one option be served first
-                if len(operator.candidateEntities)==1:
-                    operatorsWithOneCandidateEntity.append(operator)
         # if the candidate entity has only one receiver then append the operator to operatorsWithOneOption list
-                    if len(operator.candidateEntities[0].candidateReceivers)==1:
+            if operator.hasOneOption():
                 operatorsWithOneOption.append(operator)
         
         # TODO: the operator here actually chooses entity. This may pose a problem as two entities may be equivalent
@@ -516,6 +492,7 @@ class Router(ObjectInterruption):
             # sort according to the number of options
             if operatorsWithOneOption:
                 self.candidateOperators.sort(key=lambda x: x in operatorsWithOneOption, reverse=True)
+        
         #=======================================================================
 #         # testing
 #         if self.managed: