machine internal method ifCanDisposeOrHaveFailure updated to a more generic...

machine internal method ifCanDisposeOrHaveFailure updated to a more generic version. This way MachineJobShop also does not have to override it

dream/simulation/Machine.py

@@ -279,9 +279,9 @@ class Machine(CoreObject):
     # =======================================================================
     # checks if the machine down or it can dispose the object
     # =======================================================================
+    #checks if the machine down or it can dispose the object
     def ifCanDisposeOrHaveFailure(self):
-        # the last part is added so that it is not removed and stack gotta think of it again 
-         return self.Up==False or self.next[0].canAccept(self) or len(self.Res.activeQ)==0     
+         return self.Up==False or self.getReceiverObject().canAccept(self) or len(self.getActiveObjectQueue())==0  
   
     # =======================================================================
     # removes an entity from the Machine

dream/simulation/MachineJobShop.py

@@ -40,11 +40,7 @@ class MachineJobShop(Machine):
         self.nextStationId=avtiveEntity.remainingRoute[1][0]    #read the next station id
         avtiveEntity.remainingRoute.pop(0)      #remove data from the remaining route of the entity
         return avtiveEntity  
-
-    #checks if the machine down or it can dispose the object
-    def ifCanDisposeOrHaveFailure(self):
-         return self.Up==False or self.getReceiverObject().canAccept(self) or len(self.getActiveObjectQueue())==0  
-                                                                                
+                                                                               
     #calculates the processing time
     def calculateProcessingTime(self):
         return self.procTime    #this is the processing time for this unique entity