[haizea-commit] r838 - branches/1.1/src/haizea/core/scheduler

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2010-07-28 17:33:24 -0500 (Wed, 28 Jul 2010)
New Revision: 838

Modified:
   branches/1.1/src/haizea/core/scheduler/slottable.py
Log:
Fixed bug in how cp_list is constructed


Modified: branches/1.1/src/haizea/core/scheduler/slottable.py
===================================================================
--- branches/1.1/src/haizea/core/scheduler/slottable.py	2010-07-28 22:32:18 UTC (rev 837)
+++ branches/1.1/src/haizea/core/scheduler/slottable.py	2010-07-28 22:33:24 UTC (rev 838)
@@ -612,7 +612,6 @@
         @param rr: Resource reservation
         @type rr: L{ResourceReservation}
         """        
-        #print rr.lease.id, rr.start, rr.end
         self.__remove_reservation(rr, rr.start, rr.end)
 
 
@@ -1106,7 +1105,7 @@
         self.time = time
         self.leases = set()
 
-        self.cp_list = [self.time] + self.slottable.get_changepoints_after(time) + include
+        self.cp_list = list(set([self.time] + self.slottable.get_changepoints_after(time) + include))
         self.cp_list.sort()
         
         # The availability window is stored using a sparse data structure that