enhancements in Examples

dream/simulation/Examples/AssemblyLine.py

-from dream.simulation.imports import Machine, Source, Exit, Part, Frame, Assembly, G 
+from dream.simulation.imports import Machine, Source, Exit, Part, Frame, Assembly, Failure, G 
 from dream.simulation.imports import simulate, activate, initialize
 
 #define the objects of the model
 Frame.capacity=4 
 Sp=Source('SP','Parts', mean=0.5, item=Part)
 Sf=Source('SF','Frames', mean=2, item=Frame)
-M=Machine('M','Machine', mean=0.25, failureDistribution='Fixed', MTTF=60, MTTR=5)
+M=Machine('M','Machine', mean=0.25)
 A=Assembly('A','Assembly', mean=2)
 E=Exit('E1','Exit')  
 
+F=Failure(victim=M, distributionType='Fixed', MTTF=60, MTTR=5)
+
 G.ObjList=[Sp,Sf,M,A,E]   #add all the objects in G.ObjList so that they can be easier accessed later
 
+G.ObjectInterruptionList=[F]     #add all the objects in G.ObjList so that they can be easier accessed later
+
 #define predecessors and successors for the objects    
 Sp.defineRouting([A])
 Sf.defineRouting([A])
@@ -20,14 +24,19 @@ E.defineRouting([M])
 
 initialize()                        #initialize the simulation (SimPy method)
     
-#initialize all the objects    
 for object in G.ObjList:
     object.initialize()
+    
+for objectInterruption in G.ObjectInterruptionList:
+    objectInterruption.initialize()
 
 #activate all the objects 
 for object in G.ObjList:
     activate(object, object.run())
 
+for objectInterruption in G.ObjectInterruptionList:
+    activate(objectInterruption, objectInterruption.run())
+
 G.maxSimTime=1440.0     #set G.maxSimTime 1440.0 minutes (1 day)
     
 simulate(until=G.maxSimTime)    #run the simulation

dream/simulation/Examples/ParallelServers1.py

-from dream.simulation.imports import Machine, Source, Exit, Part, Queue, G 
+from dream.simulation.imports import Machine, Source, Exit, Part, Queue, G, Failure 
 from dream.simulation.imports import simulate, activate, initialize, infinity
 
 #define the objects of the model
 S=Source('S','Source', mean=0.5, item=Part)
 Q=Queue('Q','Queue', capacity=infinity)
-M1=Machine('M1','Milling1', mean=0.25, failureDistribution='Fixed', MTTF=60, MTTR=5)
+M1=Machine('M1','Milling1', mean=0.25)
 M2=Machine('M2','Milling2', mean=0.25)
 E=Exit('E1','Exit')  
 
+F=Failure(victim=M1, distributionType='Fixed', MTTF=60, MTTR=5)
+
 G.ObjList=[S,Q,M1,M2,E]   #add all the objects in G.ObjList so that they can be easier accessed later
 
+G.ObjectInterruptionList=[F]     #add all the objects in G.ObjList so that they can be easier accessed later
+
+
 #define predecessors and successors for the objects    
 S.defineRouting([Q])
 Q.defineRouting([S],[M1,M2])
@@ -19,14 +24,19 @@ E.defineRouting([M1,M2])
 
 initialize()                        #initialize the simulation (SimPy method)
     
-#initialize all the objects    
 for object in G.ObjList:
     object.initialize()
+    
+for objectInterruption in G.ObjectInterruptionList:
+    objectInterruption.initialize()
 
 #activate all the objects 
 for object in G.ObjList:
     activate(object, object.run())
 
+for objectInterruption in G.ObjectInterruptionList:
+    activate(objectInterruption, objectInterruption.run())
+
 G.maxSimTime=1440.0     #set G.maxSimTime 1440.0 minutes (1 day)
     
 simulate(until=G.maxSimTime)    #run the simulation

dream/simulation/Examples/ParallelServers2.py

-from dream.simulation.imports import Machine, Source, Exit, Part, Queue, G, Globals 
+from dream.simulation.imports import Machine, Source, Exit, Part, Queue, G, Globals, Failure 
 from dream.simulation.imports import simulate, activate, initialize, infinity
 
 #the custom queue
@@ -16,13 +16,18 @@ class SelectiveQueue(Queue):
         
 #define the objects of the model
 S=Source('S','Source', mean=0.5, item=Part)
-Q=SelectiveQueue('Q','Queue', capacity=infinity)    #Q is now of type SelectiveQueue
-M1=Machine('M1','Milling1', mean=0.25, failureDistribution='Fixed', MTTF=60, MTTR=5)
+Q=SelectiveQueue('Q','Queue', capacity=infinity)
+M1=Machine('M1','Milling1', mean=0.25)
 M2=Machine('M2','Milling2', mean=0.25)
 E=Exit('E1','Exit')  
 
+F=Failure(victim=M1, distributionType='Fixed', MTTF=60, MTTR=5)
+
 G.ObjList=[S,Q,M1,M2,E]   #add all the objects in G.ObjList so that they can be easier accessed later
 
+G.ObjectInterruptionList=[F]     #add all the objects in G.ObjList so that they can be easier accessed later
+
+
 #define predecessors and successors for the objects    
 S.defineRouting([Q])
 Q.defineRouting([S],[M1,M2])
@@ -32,14 +37,19 @@ E.defineRouting([M1,M2])
 
 initialize()                        #initialize the simulation (SimPy method)
     
-#initialize all the objects    
 for object in G.ObjList:
     object.initialize()
+    
+for objectInterruption in G.ObjectInterruptionList:
+    objectInterruption.initialize()
 
 #activate all the objects 
 for object in G.ObjList:
     activate(object, object.run())
 
+for objectInterruption in G.ObjectInterruptionList:
+    activate(objectInterruption, objectInterruption.run())
+
 G.maxSimTime=1440.0     #set G.maxSimTime 1440.0 minutes (1 day)
     
 simulate(until=G.maxSimTime)    #run the simulation
@@ -52,5 +62,3 @@ for object in G.ObjList:
 print "the system produced", E.numOfExits, "parts"
 print "the working ratio of", M1.objName,  "is", (M1.totalWorkingTime/G.maxSimTime)*100, "%"
 print "the working ratio of", M2.objName,  "is", (M2.totalWorkingTime/G.maxSimTime)*100, "%"
-
-

dream/simulation/Examples/ParallelServers3.py

-from dream.simulation.imports import Machine, Source, Exit, Part, Queue, G, Globals 
+from dream.simulation.imports import Machine, Source, Exit, Part, Queue, G, Globals, Failure 
 from dream.simulation.imports import simulate, activate, initialize, infinity
 
 #the custom queue
@@ -36,13 +36,17 @@ class CountingExit(Exit):
 #define the objects of the model
 S=Source('S','Source', mean=0.5, item=Part)
 Q=SelectiveQueue('Q','Queue', capacity=infinity)
-M1=Milling('M1','Milling1', mean=0.25, failureDistribution='Fixed', MTTF=60, MTTR=5)
+M1=Milling('M1','Milling1', mean=0.25)
 M2=Milling('M2','Milling2', mean=0.25)
 E=CountingExit('E1','Exit')  
 
+F=Failure(victim=M1, distributionType='Fixed', MTTF=60, MTTR=5)
+
 G.ObjList=[S,Q,M1,M2,E]   #add all the objects in G.ObjList so that they can be easier accessed later
 
-#create the global variables
+G.ObjectInterruptionList=[F]     #add all the objects in G.ObjList so that they can be easier accessed later
+
+#create the global counter variables
 G.NumM1=0
 G.NumM2=0
 
@@ -55,14 +59,19 @@ E.defineRouting([M1,M2])
 
 initialize()                        #initialize the simulation (SimPy method)
     
-#initialize all the objects    
 for object in G.ObjList:
     object.initialize()
+    
+for objectInterruption in G.ObjectInterruptionList:
+    objectInterruption.initialize()
 
 #activate all the objects 
 for object in G.ObjList:
     activate(object, object.run())
 
+for objectInterruption in G.ObjectInterruptionList:
+    activate(objectInterruption, objectInterruption.run())
+
 G.maxSimTime=1440.0     #set G.maxSimTime 1440.0 minutes (1 day)
     
 simulate(until=G.maxSimTime)    #run the simulation

dream/simulation/Examples/TwoServers.py

@@ -15,7 +15,7 @@ F2=Failure(victim=M2, distributionType='Fixed', MTTF=40, MTTR=10, repairman=R)
 
 G.ObjList=[S,M1,M2,E,Q]   #add all the objects in G.ObjList so that they can be easier accessed later
 
-G.FailureList=[F1,F2]     #add all the objects in G.ObjList so that they can be easier accessed later
+G.ObjectInterruptionList=[F1,F2]     #add all the objects in G.ObjList so that they can be easier accessed later
 
 #define predecessors and successors for the objects    
 S.defineRouting([M1])
@@ -32,15 +32,16 @@ R.initialize()
 for object in G.ObjList:
     object.initialize()
     
-for failure in G.FailureList:
-    failure.initialize()
+for objectInterruption in G.ObjectInterruptionList:
+    objectInterruption.initialize()
 
 #activate all the objects 
 for object in G.ObjList:
     activate(object, object.run())
 
-for failure in G.FailureList:
-    activate(failure, failure.run())
+for objectInterruption in G.ObjectInterruptionList:
+    activate(objectInterruption, objectInterruption.run())
+
 
 G.maxSimTime=1440.0     #set G.maxSimTime 1440.0 minutes (1 day)
     

dream/simulation/Examples/TwoServersPlots.py

@@ -18,7 +18,7 @@ F2=Failure(victim=M2, distributionType='Fixed', MTTF=40, MTTR=10, repairman=R)
 
 G.ObjList=[S,M1,M2,E,Q]   #add all the objects in G.ObjList so that they can be easier accessed later
 
-G.FailureList=[F1,F2]     #add all the objects in G.ObjList so that they can be easier accessed later
+G.ObjectInterruptionList=[F1,F2]     #add all the objects in G.ObjList so that they can be easier accessed later
 
 #define predecessors and successors for the objects    
 S.defineRouting([M1])
@@ -35,15 +35,15 @@ R.initialize()
 for object in G.ObjList:
     object.initialize()
     
-for failure in G.FailureList:
-    failure.initialize()
+for objectInterruption in G.ObjectInterruptionList:
+    objectInterruption.initialize()
 
 #activate all the objects 
 for object in G.ObjList:
     activate(object, object.run())
 
-for failure in G.FailureList:
-    activate(failure, failure.run())
+for objectInterruption in G.ObjectInterruptionList:
+    activate(objectInterruption, objectInterruption.run())
 
 G.maxSimTime=1440.0     #set G.maxSimTime 1440.0 minutes (1 day)
     

dream/simulation/Examples/TwoServersStochastic.py

@@ -15,7 +15,7 @@ F2=Failure(victim=M2, distributionType='Fixed', MTTF=40, MTTR=10, repairman=R)
 
 G.ObjList=[S,M1,M2,E,Q]   #add all the objects in G.ObjList so that they can be easier accessed later
 
-G.FailureList=[F1,F2]     #add all the objects in G.ObjList so that they can be easier accessed later
+G.ObjectInterruptionList=[F1,F2]     #add all the objects in G.ObjList so that they can be easier accessed later
 
 #define predecessors and successors for the objects    
 S.defineRouting([M1])
@@ -38,16 +38,16 @@ for i in range(G.numberOfReplications):
     R.initialize()
     for object in G.ObjList:
         object.initialize()
-
-    for failure in G.FailureList:
-        failure.initialize()
+        
+    for objectInterruption in G.ObjectInterruptionList:
+        objectInterruption.initialize()
     
     #activate all the objects 
     for object in G.ObjList:
         activate(object, object.run())
-        
-    for failure in G.FailureList:
-        activate(failure, failure.run())
+    
+    for objectInterruption in G.ObjectInterruptionList:
+        activate(objectInterruption, objectInterruption.run())
     
     simulate(until=G.maxSimTime)    #run the simulation