From 69624af5a93ac4e7ad36485b625346a8615e6c5e Mon Sep 17 00:00:00 2001 From: Pawel Solyga Date: Wed, 4 Mar 2009 21:10:07 +0000 Subject: [PATCH] Comment out unused variables and add used but not declared class variables to __init__ method in soc.logic.allocations module. Patch by: Pawel Solyga Reviewed by: to-be-reviewed --- app/soc/logic/allocations.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/soc/logic/allocations.py b/app/soc/logic/allocations.py index 2ca44200..08d99312 100644 --- a/app/soc/logic/allocations.py +++ b/app/soc/logic/allocations.py @@ -60,7 +60,12 @@ class Allocator(object): for _, value in applications.iteritems(): all_applications += value - + + self.locked_slots = {} + self.adjusted_slots = {} + self.adjusted_orgss = [] + self.locked_orgs = [] + self.unlocked_applications = [] self.slots = slots self.max_slots_per_org = max_slots_per_org self.orgs = set(orgs) @@ -96,12 +101,13 @@ class Allocator(object): adjusted_orgs = set(adjusted_slots.keys()) # set a' and b' - unlocked_orgs = self.orgs.difference(locked_orgs) - unadjusted_orgs = self.orgs.difference(adjusted_orgs) + # unlocked_orgs = self.orgs.difference(locked_orgs) + # unadjusted_orgs = self.orgs.difference(adjusted_orgs) # set a*b and a'*b' locked_and_adjusted_orgs = locked_orgs.intersection(adjusted_orgs) - unlocked_and_unadjusted_orgs = unlocked_orgs.intersection(unadjusted_orgs) + + # unlocked_and_unadjusted_orgs = unlocked_orgs.intersection(unadjusted_orgs) # a+o and b+o should be o locked_orgs_or_orgs = self.orgs.union(locked_orgs) -- 2.11.4.GIT