X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fmodel%2Fexpenditure.py;h=f7e69344dc2cf88bf09cb7f0fa6ea9a81fdc4cb9;hb=eadf3c3a4e49086b24dd61ead8ea95cdada8b88a;hp=58456fb8a71730d48c0a4936da2eabd1ee1384ca;hpb=5c9f0e33552b9420736f0d733134a1e62ef8df03;p=bluechips.git diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py index 58456fb..f7e6934 100644 --- a/bluechips/model/expenditure.py +++ b/bluechips/model/expenditure.py @@ -60,12 +60,6 @@ class Expenditure(object): total = sum(split_dict.itervalues()) - for user, share in split_dict.items(): - if share == 0: - del split_dict[user] - else: - split_dict[user] = share / total - for user, share in split_dict.items(): if share == 0: del split_dict[user] @@ -84,12 +78,12 @@ class Expenditure(object): winner = random.choice(amounts_dict.keys()) amounts_dict[winner] += Currency(1) elif difference < 0: - for i in xrange(difference): + for i in xrange(-difference): winner = random.choice(amounts_dict.keys()) amounts_dict[winner] -= Currency(1) for user, share in amounts_dict.iteritems(): s = Split(self, user, share) - meta.Session.save(s) + meta.Session.add(s) __all__ = ['Expenditure']