Fix in winq sched rule

d332d203 · Georgios Dagkakis · 80344dc3 · d332d203
Commit d332d203 authored Apr 14, 2015 by Georgios Dagkakis
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

dream/simulation/Queue.py dream/simulation/Queue.py +8 -5

No files found.
--- a/dream/simulation/Queue.py
+++ b/dream/simulation/Queue.py
@@ -309,11 +309,14 @@ class Queue(CoreObject):
        elif criterion=="WINQ":
            from Globals import G
            for entity in activeObjectQ:
-                nextObjIds=entity.remainingRoute[1].get('stationIdsList',[])
+                if len(entity.remainingRoute)>1:
-                for obj in G.ObjList:
+                    nextObjIds=entity.remainingRoute[1].get('stationIdsList',[])
-                    if obj.id in nextObjIds:
+                    for obj in G.ObjList:
-                        nextObject=obj
+                        if obj.id in nextObjIds:
-                entity.nextQueueLength=len(nextObject.Res.users)           
+                            nextObject=obj
+                    entity.nextQueueLength=len(nextObject.Res.users) 
+                else:
+                    entity.nextQueueLength=0          
            activeObjectQ.sort(key=lambda x: x.nextQueueLength)
        else:
            assert False, "Unknown scheduling criterion %r" % (criterion, )