correction in preemption

d38f63b2 · Georgios Dagkakis · Ioannis Papagiannopoulos · 50ca24e3 · d38f63b2
Commit d38f63b2 authored Dec 23, 2014 by Georgios Dagkakis Committed by Ioannis Papagiannopoulos Jan 06, 2015
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

dream/simulation/MachineJobShop.py dream/simulation/MachineJobShop.py +2 -5

No files found.
--- a/dream/simulation/MachineJobShop.py
+++ b/dream/simulation/MachineJobShop.py
@@ -185,12 +185,9 @@ class MachineJobShop(Machine):
        #update the remaining route of activeEntity
        activeEntity.remainingRoute.insert(0, {'stationIdsList':[str(self.id)],\
                                               'processingTime':\
-                                                    {'distributionType':'Fixed',\
+                                                    {'Fixed':{'mean':str(remainingProcessingTime)}}})
-                                                     'mean':str(remainingProcessingTime)}})
        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 
        self.receiver=self.lastGiver
        self.next=[self.receiver]