new method added to Machine, searching for candidate operators. Clean-up in operator

dream/simulation/Machine.py

@@ -779,6 +779,18 @@ class Machine(CoreObject):
         if not self.router.isCalled():
             self.router.invoke()
             
+    #===========================================================================
+    # find candidate operators within the free operators
+    #===========================================================================
+    def findCandidateOperator(self):
+        activeObject=self.getActiveObject()
+        # TODO: this way no sorting is performed
+        # find an available operator
+        candidateOperator=activeObject.operatorPool.findAvailableOperator()
+        # append the station into its candidateStations
+        candidateOperator.candidateStations.append(activeObject)
+        return candidateOperator
+    
     # =======================================================================
     #                   prepare the machine to be operated
     # =======================================================================

dream/simulation/OperatorRouter.py

@@ -357,28 +357,20 @@ class Router(ObjectInterruption):
         # if we are not dealing with managed entities
         #------------------------------------------------------------------------------ 
         if not self.managed:
-            # if there are pendingEntities
-            if self.pendingObjects:
-            # for each pendingObject 
             # for each pendingMachine
             for object in self.pendingMachines:
-#                     if object in self.pendingMachines:
-                    # find an available operator
-                    candidateOperator=object.operatorPool.findAvailableOperator()
+                # find candidateOperators for each object operator
+                candidateOperator=object.findCandidateOperator()
                 # TODO: this way no sorting is performed
                 if not candidateOperator in self.candidateOperators:
                     self.candidateOperators.append(candidateOperator)
-                    # for each operator append the station into its candidateStations
-                    candidateOperator.candidateStations.append(object)
             # for each pendingQueue
             for object in self.pendingQueues:
-#                     elif object in self.pendingQueues:
                 # find available operator for then machines that follow
                 for nextobject in object.findReceivers():
-                        candidateOperator=nextobject.operatorPool.findAvailableOperator()
+                    candidateOperator=nextobject.findCandidateOperator()
                     if not candidateOperator in self.candidateOperators:
                         self.candidateOperators.append(candidateOperator)
-                        candidateOperator.candidateStations.append(nextobject)
             # update the schedulingRule/multipleCriterionList of the Router
             if self.sorting:
                 self.updateSchedulingRule()