pickCandidateEntitiesFrom moved to operator

dream/simulation/Operator.py

@@ -101,6 +101,14 @@ class Operator(ObjectResource):
     def hasOneOption(self):
         return len(self.candidateStations)==1
     
+    #=======================================================================
+    # findCandidateEntities method finding the candidateEntities of the operator  
+    #=======================================================================
+    def pickCandidateEntitiesFrom(self, pendingEntities=[]):
+        if pendingEntities:
+            for entity in [x for x in pendingEntities if x.canProceed and x.manager==self]:
+                self.candidateEntities.append(entity)
+    
     # =======================================================================
     #    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,20 +86,6 @@ class OperatorManagedJob(Operator):
 #     def isAssignedTo(self):
 #         return self.operatorAssignedTo
         
-    #=======================================================================
-    # findCandidateEntities method finding the candidateEntities of the operator  
-    #=======================================================================
-    def pickCandidateEntitiesFrom(self, pendingEntities=[]):
-#         print 'trying to import G'
-#         from Globals import G
-#         router=G.Router
-#         if router.pending:
-        if pendingEntities:
-#             print now(), self.id
-            for entity in [x for x in pendingEntities 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
     #===========================================================================