Commit 17a15983 authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Jérome Perrin

small enhancement in MachineJobShop

parent 03c7e947
...@@ -48,10 +48,9 @@ class MachineJobShop(Machine): ...@@ -48,10 +48,9 @@ class MachineJobShop(Machine):
def getEntity(self): def getEntity(self):
activeEntity=Machine.getEntity(self) #run the default code activeEntity=Machine.getEntity(self) #run the default code
# read the processing time from the corresponding remainingRoute entry # read the processing time from the corresponding remainingRoute entry
processingTime=activeEntity.remainingRoute[0]['processingTime'] processingTime=activeEntity.remainingRoute[0].get('processingTime',{})
self.distType=processingTime.get('distributionType','not found') self.distType=processingTime.get('distributionType','Fixed')
self.procTime=float(processingTime.get('mean', 0)) self.procTime=float(processingTime.get('mean', 0))
# self.procTime=activeEntity.remainingRoute[0][1] #read the processing time from the entity
import Globals import Globals
# read the list of next stations # read the list of next stations
nextObjectIds=activeEntity.remainingRoute[1].get('stationIdsList',[]) nextObjectIds=activeEntity.remainingRoute[1].get('stationIdsList',[])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment