operators scheduling rule also updated

dream/simulation/Operator.py

@@ -195,7 +195,7 @@ class Operator(ObjectResource):
                 for step in entity.remainingRoute:
                     processingTime=step.get('processingTime',None)
                     if processingTime:
-                        RPT+=float(processingTime.get('mean',0))           
+                        RPT+=float(processingTime.get('Fixed',{}).get('mean',0))           
                 entity.remainingProcessingTime=RPT
             activeObjectQ.sort(key=lambda x: x.remainingProcessingTime, reverse=True)     
         #if the schedulingRule is to sort Entities according to longest processing time first in the next station
@@ -203,9 +203,9 @@ class Operator(ObjectResource):
             
             for entity in activeObjectQ:
                 processingTime = entity.remainingRoute[0].get('processingTime',None)
-                entity.processingTimeInNextStation=float(processingTime.get('mean',0))
+                entity.processingTimeInNextStation=float(processingTime.get('Fixed',{}).get('mean',0))
                 if processingTime:
-                    entity.processingTimeInNextStation=float(processingTime.get('mean',0))
+                    entity.processingTimeInNextStation=float(processingTime.get('Fixed',{}).get('mean',0))
                 else:
                     entity.processingTimeInNextStation=0
             activeObjectQ.sort(key=lambda x: x.processingTimeInNextStation, reverse=True)             
@@ -215,7 +215,7 @@ class Operator(ObjectResource):
             for entity in activeObjectQ:
                 processingTime = entity.remainingRoute[0].get('processingTime',None)
                 if processingTime:
-                    entity.processingTimeInNextStation=float(processingTime.get('mean',0))
+                    entity.processingTimeInNextStation=float(processingTime.get('Fixed',{}).get('mean',0))
                 else:
                     entity.processingTimeInNextStation=0
             activeObjectQ.sort(key=lambda x: x.processingTimeInNextStation) 
@@ -227,7 +227,7 @@ class Operator(ObjectResource):
                 for step in entity.remainingRoute:
                     processingTime=step.get('processingTime',None)
                     if processingTime:
-                        RPT+=float(processingTime.get('mean',0))              
+                        RPT+=float(processingTime.get('Fixed',{}).get('mean',0))              
                 entity.remainingProcessingTime=RPT
             activeObjectQ.sort(key=lambda x: (x.dueDate-x.remainingProcessingTime))  
         #if the schedulingRule is to sort Entities based on the length of the following Queue