getEntity of MachinePreemptive collapsed to CoreObject

dream/simulation/CoreObject.py

@@ -97,7 +97,9 @@ class CoreObject(Process):
         self.failureTimeInCurrentEntity=0
         self.setupTimeCurrentEntity=0
  
-        self.shouldPreempt=False    #flag that shows that the machine should preempt or not       
+        self.shouldPreempt=False    #flag that shows that the machine should preempt or not
+        
+        self.lastGiver=None         # variable that holds the last giver of the object, used by machine in case of preemption    
 
     # =======================================================================
     #                the main process of the core object 
@@ -155,7 +157,8 @@ class CoreObject(Process):
         activeObjectQueue=self.getActiveObjectQueue()
         # remove entity from the giver
         activeEntity = giverObject.removeEntity()
-
+        # variable that holds the last giver; used in case of preemption
+        self.lastGiver=self.giver
         #get the entity from the previous object and put it in front of the activeQ 
         activeObjectQueue.append(activeEntity)   
         # if the giverObject is blocked then unBlock it

dream/simulation/MachinePreemptive.py

@@ -45,10 +45,10 @@ class MachinePreemptive(MachineJobShop):
                   setupDistribution,setupMean, setupStdev, setupMin, setupMax)
         self.resetOnPreemption=resetOnPreemption    #flag that shows if the processing  time should be reset or not
                  
-    def getEntity(self):
-        activeEntity=MachineJobShop.getEntity(self)
-        self.lastGiver=self.giver
-        return activeEntity
+#     def getEntity(self):
+#         activeEntity=MachineJobShop.getEntity(self)
+#         self.lastGiver=self.giver
+#         return activeEntity
         
     # =======================================================================
     # method to execute the preemption