releaseOperator of MachineManagedJob collapsed to Machine

dream/simulation/Machine.py

@@ -206,6 +206,11 @@ class Machine(CoreObject):
             # reset the canProceedWithGetEntity flag
             self.canProceedWithGetEntity=False
             
+            #===================================================================
+#             # TESTING
+#             print now(), self.id, 'is in position to get'
+            #===================================================================
+            
             # if the machine must be operated for the loading then the operators must be picked wisely for every machine
             if (self.operatorPool!="None")\
                     and any(type=="Load" for type in self.multOperationTypeList):
@@ -729,6 +734,8 @@ class Machine(CoreObject):
     # =======================================================================
     def releaseOperator(self):
         self.outputTrace(self.currentOperator.objName, "released from "+ self.objName)
+        # set the flag operatorAssignedTo to None
+        self.currentOperator.operatorAssignedTo=None
         self.broker.invokeBroker()
         self.toBeOperated = False
         

dream/simulation/MachineManagedJob.py

@@ -193,15 +193,15 @@ class MachineManagedJob(MachineJobShop):
 #             return True
         
 
-    # =======================================================================
-    #                   prepare the machine to be released
-    # =======================================================================
-    def releaseOperator(self):
-        self.outputTrace(self.currentOperator.objName, "released from "+ self.objName)
-#         # TESTING
-#         print now(), self.id, 'will release operator', self.operatorPool.operators[0].objName
-        # set the flag operatorAssignedTo to None
-        self.operatorPool.operators[0].operatorAssignedTo=None
-        self.broker.invokeBroker()
-        self.toBeOperated = False
+#     # =======================================================================
+#     #                   prepare the machine to be released
+#     # =======================================================================
+#     def releaseOperator(self):
+#         self.outputTrace(self.currentOperator.objName, "released from "+ self.objName)
+# #         # TESTING
+# #         print now(), self.id, 'will release operator', self.operatorPool.operators[0].objName
+#         # set the flag operatorAssignedTo to None
+#         self.currentOperator.operatorAssignedTo=None
+#         self.broker.invokeBroker()
+#         self.toBeOperated = False