methods of interrupting and reactivating an object were passed to generic...

methods of interrupting and reactivating an object were passed to generic ObjectInterruption. This will make the interruptions more flexible

dream/simulation/Failure.py

@@ -26,7 +26,7 @@ Created on 9 Nov 2012
 models the failures that servers can have
 '''
 
-from SimPy.Simulation import now, Process, hold, request, reactivate, release
+from SimPy.Simulation import now, Process, hold, request, release
 import math
 from RandomNumberGenerator import RandomNumberGenerator
 from ObjectInterruption import ObjectInterruption
@@ -86,7 +86,7 @@ class Failure(ObjectInterruption):
             yield hold,self,self.rngTTF.generateNumber()    # wait until a failure happens                  
             try:
                 if(len(self.getVictimQueue())>0):           # when a Machine gets failure
-                    self.interrupt(self.victim)             #     while in process it is interrupted
+                    self.interruptVictim()             #     while in process it is interrupted
                 self.victim.Up=False
                 self.victim.timeLastFailure=now()           
                 self.outputTrace("is down")
@@ -106,7 +106,7 @@ class Failure(ObjectInterruption):
             
             try:
                 if(len(self.getVictimQueue())>0):                
-                    reactivate(self.victim)                 # since repairing is over, the Machine is reactivated
+                    self.reactivateVictim()                 # since repairing is over, the Machine is reactivated
                 self.victim.Up=True              
                 self.outputTrace("is up")              
                 if(self.repairman!="None"): #if a resource was used, it is now released

dream/simulation/ObjectInterruption.py

@@ -26,7 +26,7 @@ Created on 18 Aug 2013
 Class that acts as an abstract. It should have no instances. All object interruptions (eg failures, breaks) should inherit from it
 '''
 
-from SimPy.Simulation import Process, Resource
+from SimPy.Simulation import Process, Resource, reactivate
 
 class ObjectInterruption(Process):
     
@@ -52,6 +52,13 @@ class ObjectInterruption(Process):
     
     def postProcessing(self):
         pass
-        
+    
+    #interrupts the victim
+    def interruptVictim(self):
+        self.interrupt(self.victim) 
+    
+    #reactivate the victim
+    def reactivateVictim(self):
+        reactivate(self.victim)  
         
         
\ No newline at end of file