several examples updated

dream/simulation/Examples/AssemblyLine.py

@@ -3,13 +3,13 @@ from dream.simulation.Globals import runSimulation
 
 #define the objects of the model
 Frame.capacity=4 
-Sp=Source('SP','Parts', interarrivalTime={'distributionType':'Fixed','mean':0.5}, entity='Dream.Part')
-Sf=Source('SF','Frames', interarrivalTime={'distributionType':'Fixed','mean':2}, entity='Dream.Frame')
-M=Machine('M','Machine', processingTime={'distributionType':'Fixed','mean':0.25})
-A=Assembly('A','Assembly', processingTime={'distributionType':'Fixed','mean':2})
+Sp=Source('SP','Parts', interArrivalTime={'Fixed':{'mean':0.5}}, entity='Dream.Part')
+Sf=Source('SF','Frames', interArrivalTime={'Fixed':{'mean':2}}, entity='Dream.Frame')
+M=Machine('M','Machine', processingTime={'Fixed':{'mean':0.25}})
+A=Assembly('A','Assembly', processingTime={'Fixed':{'mean':2}})
 E=Exit('E1','Exit')  
 
-F=Failure(victim=M, distribution={'distributionType':'Fixed','MTTF':60,'MTTR':5})
+F=Failure(victim=M, distribution={'TTF':{'Fixed':{'mean':60.0}},'TTR':{'Fixed':{'mean':5.0}}})
 
 #define predecessors and successors for the objects    
 Sp.defineRouting([A])

dream/simulation/Examples/BalancingABuffer.py

@@ -26,7 +26,7 @@ def balanceQueue(buffer, refillLevel=1):
 
 #define the objects of the model 
 Q=Queue('Q1','Queue', capacity=float('inf'))
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':6})
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':6}})
 E=Exit('E1','Exit')
 EV=EventGenerator('EV', 'EntityCreator', start=0, stop=float('inf'), interval=20,method=balanceQueue, 
                   argumentDict={'buffer':Q, 'refillLevel':5})  

dream/simulation/Examples/ChangingPredecessors.py

@@ -26,7 +26,7 @@ def changeMachinePredecessor(machine, possiblePredecessors):
 #define the objects of the model 
 Q1=Queue('Q1','Queue1', capacity=float('inf'))
 Q2=Queue('Q2','Queue2', capacity=float('inf'))
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':3})
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':3}})
 E=Exit('E1','Exit')  
 P1=Part('P1', 'Part1', currentStation=Q1)
 entityList=[]

dream/simulation/Examples/ClearBatchLines.py

@@ -3,14 +3,14 @@ from dream.simulation.imports import Machine, Source, Exit, Batch, BatchDecompos
 from dream.simulation.Globals import runSimulation
 
 # define the objects of the model
-S=BatchSource('S','Source',interarrivalTime={'distributionType':'Fixed','mean':1.5}, entity='Dream.Batch', batchNumberOfUnits=100)
+S=BatchSource('S','Source',interArrivalTime={'Fixed':{'mean':1.5}}, entity='Dream.Batch', batchNumberOfUnits=100)
 Q=Queue('Q','StartQueue',capacity=100000)
-BD=BatchDecomposition('BC', 'BatchDecomposition', numberOfSubBatches=4, processingTime={'distributionType':'Fixed','mean':1})
-M1=Machine('M1','Machine1',processingTime={'distributionType':'Fixed','mean':0.5})
+BD=BatchDecomposition('BC', 'BatchDecomposition', numberOfSubBatches=4, processingTime={'Fixed':{'mean':1}})
+M1=Machine('M1','Machine1',processingTime={'Fixed':{'mean':0.5}})
 Q1=LineClearance('Q1','Queue1',capacity=2)
-M2=Machine('M2','Machine2',processingTime={'distributionType':'Fixed','mean':4})
-BRA=BatchReassembly('BRA', 'BatchReassembly', numberOfSubBatches=4, processingTime={'distributionType':'Fixed','mean':0})
-M3=Machine('M3','Machine3',processingTime={'distributionType':'Fixed','mean':1})
+M2=Machine('M2','Machine2',processingTime={'Fixed':{'mean':4}})
+BRA=BatchReassembly('BRA', 'BatchReassembly', numberOfSubBatches=4, processingTime={'Fixed':{'mean':0}})
+M3=Machine('M3','Machine3',processingTime={'Fixed':{'mean':1}})
 E=Exit('E','Exit')
 
 # define the predecessors and successors for the objects

dream/simulation/Examples/DecompositionOfBatches.py

@@ -2,10 +2,10 @@ from dream.simulation.imports import Machine, BatchSource, Exit, Batch, BatchDec
 from dream.simulation.Globals import runSimulation
 
 # define the objects of the model
-S=BatchSource('S','Source',interarrivalTime={'distributionType':'Fixed','mean':0.5}, entity='Dream.Batch', batchNumberOfUnits=4)
+S=BatchSource('S','Source',interArrivalTime={'Fixed':{'mean':0.5}}, entity='Dream.Batch', batchNumberOfUnits=4)
 Q=Queue('Q','StartQueue',capacity=100000)
-BD=BatchDecomposition('BC', 'BatchDecomposition', numberOfSubBatches=4, processingTime={'distributionType':'Fixed','mean':1})
-M=Machine('M','Machine',processingTime={'distributionType':'Fixed','mean':0.5})
+BD=BatchDecomposition('BC', 'BatchDecomposition', numberOfSubBatches=4, processingTime={'Fixed':{'mean':1}})
+M=Machine('M','Machine',processingTime={'Fixed':{'mean':0.5}})
 E=Exit('E','Exit')
 
 # define the predecessors and successors for the objects

dream/simulation/Examples/JobShop1.py

@@ -12,11 +12,11 @@ E=ExitJobShop('E','Exit')
 
 #define the route of the Job in the system
 route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "1"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':1}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["E"],}]
 #define the Jobs
 J=Job('J1','Job1',route=route)

dream/simulation/Examples/JobShop1Trace.py

@@ -12,11 +12,11 @@ E=ExitJobShop('E','Exit')
 
 #define the route of the Job in the system
 route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "1"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':1}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["E"],}]
 #define the Jobs
 J=Job('J1','Job1',route=route)

dream/simulation/Examples/JobShop2EDD.py

@@ -20,23 +20,23 @@ M3.defineRouting(predecessorList=[Q3])
 
 #define the routes of the Jobs in the system
 J1Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "1"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':1}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["E"],}]
 J2Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "4"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':4}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "6"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':6}}},
          {"stationIdsList": ["E"],}]
 J3Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "10"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':10}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["E"],}]
 
 #define the Jobs

dream/simulation/Examples/JobShop2MC.py

@@ -20,23 +20,23 @@ M3.defineRouting(predecessorList=[Q3])
 
 #define the routes of the Jobs in the system
 J1Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "1"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':1}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["E"],}]
 J2Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "4"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':4}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "6"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':6}}},
          {"stationIdsList": ["E"],}]
 J3Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "10"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':10}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["E"],}]
 
 #define the Jobs

dream/simulation/Examples/JobShop2Priority.py

@@ -20,23 +20,23 @@ M3.defineRouting(predecessorList=[Q3])
 
 #define the routes of the Jobs in the system
 J1Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "1"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':1}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["E"],}]
 J2Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "4"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':4}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "6"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':6}}},
          {"stationIdsList": ["E"],}]
 J3Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "10"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':10}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["E"],}]
 
 #define the Jobs

dream/simulation/Examples/JobShop2RPC.py

@@ -20,23 +20,23 @@ M3.defineRouting(predecessorList=[Q3])
 
 #define the routes of the Jobs in the system
 J1Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "1"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':1}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["E"],}]
 J2Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "2"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':2}}},
          {"stationIdsList": ["Q2"]},
-         {"stationIdsList": ["M2"],"processingTime":{"distributionType": "Fixed","mean": "4"}},
+         {"stationIdsList": ["M2"],"processingTime":{'Fixed':{'mean':4}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "6"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':6}}},
          {"stationIdsList": ["E"],}]
 J3Route=[{"stationIdsList": ["Q1"]},
-         {"stationIdsList": ["M1"],"processingTime":{"distributionType": "Fixed","mean": "10"}},
+         {"stationIdsList": ["M1"],"processingTime":{'Fixed':{'mean':10}}},
          {"stationIdsList": ["Q3"]},
-         {"stationIdsList": ["M3"],"processingTime":{"distributionType": "Fixed","mean": "3"}},
+         {"stationIdsList": ["M3"],"processingTime":{'Fixed':{'mean':3}}},
          {"stationIdsList": ["E"],}]
 
 #define the Jobs

dream/simulation/Examples/NonStarvingLine.py

@@ -3,7 +3,7 @@ from dream.simulation.Globals import runSimulation
 
 #define the objects of the model 
 NS=NonStarvingEntry('NS1','Entry',entityData={'_class':'Dream.Part'})
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':1})
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':1}})
 E=Exit('E1','Exit')  
 
 #define predecessors and successors for the objects    

dream/simulation/Examples/NonStarvingLineBatches.py

@@ -3,7 +3,7 @@ from dream.simulation.Globals import runSimulation
 
 #define the objects of the model 
 NS=NonStarvingEntry('NS1','Entry',entityData={'_class':'Dream.Batch','numberOfUnits':100})
-M=BatchScrapMachine('M1','Machine', processingTime={'distributionType':'Fixed','mean':0.02})
+M=BatchScrapMachine('M1','Machine', processingTime={'Fixed':{'mean':0.02}})
 E=Exit('E1','Exit')  
 
 #define predecessors and successors for the objects    

dream/simulation/Examples/SerialBatchProcessing.py

@@ -2,14 +2,14 @@ from dream.simulation.imports import Machine, BatchSource, Exit, Batch, BatchDec
 from dream.simulation.Globals import runSimulation
 
 # define the objects of the model
-S=BatchSource('S','Source',interarrivalTime={'distributionType':'Fixed','mean':1.5}, entity='Dream.Batch', batchNumberOfUnits=100)
+S=BatchSource('S','Source',interArrivalTime={'Fixed':{'mean':1.5}}, entity='Dream.Batch', batchNumberOfUnits=100)
 Q=Queue('Q','StartQueue',capacity=100000)
-BD=BatchDecomposition('BC', 'BatchDecomposition', numberOfSubBatches=4, processingTime={'distributionType':'Fixed','mean':1})
-M1=Machine('M1','Machine1',processingTime={'distributionType':'Fixed','mean':0.5})
+BD=BatchDecomposition('BC', 'BatchDecomposition', numberOfSubBatches=4, processingTime={'Fixed':{'mean':1}})
+M1=Machine('M1','Machine1',processingTime={'Fixed':{'mean':0.5}})
 Q1=Queue('Q1','Queue1',capacity=2)
-M2=Machine('M2','Machine2',processingTime={'distributionType':'Fixed','mean':1})
-BRA=BatchReassembly('BRA', 'BatchReassembly', numberOfSubBatches=4, processingTime={'distributionType':'Fixed','mean':0})
-M3=Machine('M3','Machine3',processingTime={'distributionType':'Fixed','mean':1})
+M2=Machine('M2','Machine2',processingTime={'Fixed':{'mean':1}})
+BRA=BatchReassembly('BRA', 'BatchReassembly', numberOfSubBatches=4, processingTime={'Fixed':{'mean':0}})
+M3=Machine('M3','Machine3',processingTime={'Fixed':{'mean':1}})
 E=Exit('E','Exit')
  
 # define the predecessors and successors for the objects

dream/simulation/Examples/ServerWithShift1.py

@@ -2,8 +2,8 @@ from dream.simulation.imports import Machine, Source, Exit, Part, ShiftScheduler
 from dream.simulation.Globals import runSimulation
 
 #define the objects of the model 
-S=Source('S1','Source',interarrivalTime={'distributionType':'Fixed','mean':0.5}, entity='Dream.Part')
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':3})
+S=Source('S1','Source',interArrivalTime={'Fixed':{'mean':0.5}}, entity='Dream.Part')
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':3}})
 E=Exit('E1','Exit')  
 
 SS=ShiftScheduler(victim=M, shiftPattern=[[0,5],[10,15]]) 

dream/simulation/Examples/ServerWithShift2.py

@@ -2,8 +2,8 @@ from dream.simulation.imports import Machine, Source, Exit, Part, ShiftScheduler
 from dream.simulation.Globals import runSimulation
 
 #define the objects of the model 
-S=Source('S1','Source',interarrivalTime={'distributionType':'Fixed','mean':0.5}, entity='Dream.Part')
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':3})
+S=Source('S1','Source',interArrivalTime={'Fixed':{'mean':0.5}}, entity='Dream.Part')
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':3}})
 E=Exit('E1','Exit')  
 
 # create a repeated shift pattern

dream/simulation/Examples/ServerWithShift3.py

@@ -2,8 +2,8 @@ from dream.simulation.imports import Machine, Source, Exit, Part, ShiftScheduler
 from dream.simulation.Globals import runSimulation
 
 #define the objects of the model 
-S=Source('S1','Source',interarrivalTime={'distributionType':'Fixed','mean':0.5}, entity='Dream.Part')
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':3})
+S=Source('S1','Source',interArrivalTime={'Fixed':{'mean':0.5}}, entity='Dream.Part')
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':3}})
 E=Exit('E1','Exit')   
 
 SS=ShiftScheduler(victim=M, shiftPattern=[[0,5],[10,15]], endUnfinished=True) 

dream/simulation/Examples/ServerWithShift4.py

@@ -2,8 +2,8 @@ from dream.simulation.imports import Machine, Source, Exit, Part, ShiftScheduler
 from dream.simulation.Globals import runSimulation
 
 #define the objects of the model 
-S=Source('S1','Source',interarrivalTime={'distributionType':'Fixed','mean':0.5}, entity='Dream.Part')
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':3})
+S=Source('S1','Source',interArrivalTime={'Fixed':{'mean':0.5}}, entity='Dream.Part')
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':3}})
 E=Exit('E1','Exit')  
 
 SS=ShiftScheduler(victim=M, shiftPattern=[[0,5],[10,15]],receiveBeforeEndThreshold=3) 

dream/simulation/Examples/SettingWip1.py

@@ -3,7 +3,7 @@ from dream.simulation.Globals import runSimulation, G
 
 #define the objects of the model 
 Q=Queue('Q1','Queue', capacity=1)
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':0.25})
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':0.25}})
 E=Exit('E1','Exit')  
 P1=Part('P1', 'Part1', currentStation=Q)
 

dream/simulation/Examples/SettingWip2.py

@@ -3,7 +3,7 @@ from dream.simulation.Globals import runSimulation, G
 
 #define the objects of the model 
 Q=Queue('Q1','Queue', capacity=1)
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':0.25})
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':0.25}})
 E=Exit('E1','Exit')  
 P1=Part('P1', 'Part1', currentStation=Q)
 P2=Part('P2', 'Part2', currentStation=M)

dream/simulation/Examples/SettingWip3.py

@@ -3,10 +3,10 @@ from dream.simulation.Globals import runSimulation, G
 
 #define the objects of the model 
 Q=Queue('Q1','Queue', capacity=1)
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':0.25})
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':0.25}})
 E=Exit('E1','Exit')  
 P1=Part('P1', 'Part1', currentStation=Q)
-P2=Part('P2', 'Part2', currentStation=M, remainingProcessingTime={'distributionType':'Fixed','mean':0.1})
+P2=Part('P2', 'Part2', currentStation=M, remainingProcessingTime={'Fixed':{'mean':0.1}})
 
 #define predecessors and successors for the objects    
 Q.defineRouting(successorList=[M])

dream/simulation/Examples/SingleServer.py

@@ -2,9 +2,9 @@ from dream.simulation.imports import Source, Queue, Machine, Exit
 from dream.simulation.Globals import runSimulation
 
 #define the objects of the model 
-S=Source('S1','Source',interarrivalTime={'distributionType':'Fixed','mean':0.5}, entity='Dream.Part')
+S=Source('S1','Source',interArrivalTime={'Fixed':{'mean':0.5}}, entity='Dream.Part')
 Q=Queue('Q1','Queue', capacity=1)
-M=Machine('M1','Machine', processingTime={'distributionType':'Fixed','mean':0.25})
+M=Machine('M1','Machine', processingTime={'Fixed':{'mean':0.25}})
 E=Exit('E1','Exit')  
 
 #define predecessors and successors for the objects