Commit d38f63b2 authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Ioannis Papagiannopoulos

correction in preemption

parent 50ca24e3
...@@ -185,12 +185,9 @@ class MachineJobShop(Machine): ...@@ -185,12 +185,9 @@ class MachineJobShop(Machine):
#update the remaining route of activeEntity #update the remaining route of activeEntity
activeEntity.remainingRoute.insert(0, {'stationIdsList':[str(self.id)],\ activeEntity.remainingRoute.insert(0, {'stationIdsList':[str(self.id)],\
'processingTime':\ 'processingTime':\
{'distributionType':'Fixed',\ {'Fixed':{'mean':str(remainingProcessingTime)}}})
'mean':str(remainingProcessingTime)}})
activeEntity.remainingRoute.insert(0, {'stationIdsList':[str(self.lastGiver.id)],\ activeEntity.remainingRoute.insert(0, {'stationIdsList':[str(self.lastGiver.id)],\
'processingTime':\ 'processingTime':{'Fixed':{'mean':'0'}}})
{'distributionType':'Fixed',\
'mean':'0'}})
#set the receiver as the object where the active entity was preempted from #set the receiver as the object where the active entity was preempted from
self.receiver=self.lastGiver self.receiver=self.lastGiver
self.next=[self.receiver] self.next=[self.receiver]
......
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