nomeclature change (repair->operation) to incorporate the use of operators

dream/simulation/Failure.py

@@ -98,8 +98,8 @@ class Failure(ObjectInterruption):
                                             #resource is available
                 yield request,self,self.repairman.getResource()
                 # update the time that the repair started
-                timeRepairStarted=now()
-                self.repairman.timeLastRepairStarted=now()
+                timeOperationStarted=now()
+                self.repairman.timeLastOperationStarted=now()
                                 
             yield hold,self,self.rngTTR.generateNumber()    # wait until the repairing process is over
             self.victim.totalFailureTime+=now()-failTime    
@@ -111,7 +111,7 @@ class Failure(ObjectInterruption):
                 self.outputTrace("is up")              
                 if(self.repairman!="None"): #if a resource was used, it is now released
                     yield release,self,self.repairman.getResource() 
-                    self.repairman.totalWorkingTime+=now()-timeRepairStarted                                
+                    self.repairman.totalWorkingTime+=now()-timeOperationStarted                                
             except AttributeError:
                 print "AttributeError2"    
            

dream/simulation/Machine.py

@@ -279,7 +279,6 @@ 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):
          return self.Up==False or self.getReceiverObject().canAccept(self) or len(self.getActiveObjectQueue())==0  
   

dream/simulation/ObjectResource.py

@@ -34,7 +34,7 @@ class ObjectResource(object):
     def initialize(self):
         self.totalWorkingTime=0         #holds the total working time
         self.totalWaitingTime=0         #holds the total waiting time
-        self.timeLastRepairStarted=0    #holds the time that the last repair was started        
+        self.timeLastOperationStarted=0    #holds the time that the last repair was started        
         self.Res=Resource(self.capacity) 
     
     # =======================================================================
@@ -89,4 +89,11 @@ class ObjectResource(object):
     #               returns the active queue of the resource
     # =======================================================================
     def getResourceQueue(self):
-        return self.Res.activeQ
\ No newline at end of file
+        return self.Res.activeQ
+    
+    # =======================================================================
+    #                  check availability of the resource
+    # =======================================================================
+    def isResourceFree(self):
+        if len(self.getResourceQueue())==0:
+            return True
\ No newline at end of file

dream/simulation/Repairman.py

@@ -41,7 +41,7 @@ class Repairman(ObjectResource):
         self.objName=name
         self.capacity=capacity      # repairman is an instance of resource
         self.type="Repairman"
-        #self.Res=Resource(self.capacity)
+        self.Res=Resource(self.capacity)
         # lists to hold statistics of multiple runs
         self.Waiting=[]             # holds the percentage of waiting time 
         self.Working=[]             # holds the percentage of working time 
@@ -56,8 +56,9 @@ class Repairman(ObjectResource):
             from Globals import G
             MaxSimtime=G.maxSimTime
         # if the repairman is currently working we have to count the time of this work    
-        if len(self.getResourceQueue())>0:
-            self.totalWorkingTime+=now()-self.timeLastRepairStarted
+#         if len(self.getResourceQueue())>0:
+        if not self.isResourceFree():
+            self.totalWorkingTime+=now()-self.timeLastOperationStarted
                 
         # Repairman was idle when he was not in any other state
         self.totalWaitingTime=MaxSimtime-self.totalWorkingTime