Eine Menge Aufräumarbeiten.
* Eine Testsuite um Mahrjong Ranking Berechnungen zu testen * Erste Arbeiten um die Workarounds aus dem "utils" Paket los zu werden. * Vieles am Code umformatiert für PEP8 conformität
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
# werden dürfen.
|
||||
|
||||
from __future__ import division
|
||||
from datetime import date
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ValidationError
|
||||
@@ -371,7 +370,8 @@ class KyuDanRanking(models.Model):
|
||||
self.wins_in_a_row = 0
|
||||
|
||||
if self.dan and self.wins_in_a_row >= 3 and self.dan < 9:
|
||||
logger.info('adding bonuspoints for 3 wins in a row for %s', self.user)
|
||||
logger.info(
|
||||
'adding bonuspoints for 3 wins in a row for %s', self.user)
|
||||
new_dan_rank = self.dan + 1
|
||||
new_dan_points = DAN_RANKS_DICT[new_dan_rank] + 1
|
||||
bonus_points = new_dan_points - self.dan_points
|
||||
@@ -379,7 +379,8 @@ class KyuDanRanking(models.Model):
|
||||
logger.debug("Stats for %s:", self.user)
|
||||
logger.debug("current dan_points: %d", self.dan_points)
|
||||
logger.debug("current dan: %d", self.dan)
|
||||
logger.debug("min required points for the next dan: %d", new_dan_points)
|
||||
logger.debug(
|
||||
"min required points for the next dan: %d", new_dan_points)
|
||||
logger.debug("bonus points to add: %d", bonus_points)
|
||||
|
||||
hanchan.dan_points += bonus_points
|
||||
@@ -404,7 +405,8 @@ class KyuDanRanking(models.Model):
|
||||
).order_by('-start')
|
||||
last_hanchan_this_event = hanchans_this_event[0]
|
||||
if hanchan != last_hanchan_this_event:
|
||||
return False # Das braucht nur am Ende eines Turnieres gemacht werden.
|
||||
# Das braucht nur am Ende eines Turnieres gemacht werden.
|
||||
return False
|
||||
else:
|
||||
event_ranking = EventRanking.objects.get(
|
||||
user=self.user,
|
||||
@@ -455,14 +457,13 @@ class KyuDanRanking(models.Model):
|
||||
valid_hanchans = valid_hanchans.order_by('start')
|
||||
if self.legacy_date:
|
||||
valid_hanchans = valid_hanchans.filter(start__gt=self.legacy_date)
|
||||
""" TODO: Hanchan Punkte nur neu berechnen wenn sie vor hachan_start
|
||||
lag. Es müssen aber alle durch die Schleife rennen, damit die Punkte
|
||||
""" TODO: Hanchan Punkte nur neu berechnen wenn sie vor hachan_start
|
||||
lag. Es müssen aber alle durch die Schleife rennen, damit die Punkte
|
||||
richtig gezählt werden."""
|
||||
if hanchan_start:
|
||||
valid_hanchans = valid_hanchans.filter(start__gte=hanchan_start)
|
||||
self.hanchan_count += valid_hanchans.count()
|
||||
for hanchan in valid_hanchans:
|
||||
logger.debug('Update Kyu/Dan points for Hanchan started on %s', str(hanchan.start))
|
||||
hanchan.get_playerdata(self.user)
|
||||
hanchan.bonus_points = 0
|
||||
hanchan.player_comment = u""
|
||||
@@ -476,6 +477,16 @@ class KyuDanRanking(models.Model):
|
||||
self.good_hanchans += 1 if hanchan.placement == 2 else 0
|
||||
hanchan.update_playerdata(self.user)
|
||||
hanchan.save(recalculate=False)
|
||||
logger.debug(
|
||||
'id: %(id)d, start: %(start)s, placement: %(placement)d, '
|
||||
'score: %(score)d, kyu points: %(kyu_points)d, dan points: '
|
||||
'%(dan_points)d, bonus points: %(bonus_points)d',
|
||||
{'id': hanchan.pk, 'start': hanchan.start,
|
||||
'placement': hanchan.placement, 'score': hanchan.game_score,
|
||||
'kyu_points': hanchan.kyu_points or 0,
|
||||
'dan_points': hanchan.dan_points or 0,
|
||||
'bonus_points': hanchan.bonus_points or 0}
|
||||
)
|
||||
self.save(force_update=True)
|
||||
|
||||
def update_hanchan_points(self, hanchan):
|
||||
@@ -543,7 +554,7 @@ class KyuDanRanking(models.Model):
|
||||
if self.dan_points > min_points:
|
||||
self.dan = dan_rank
|
||||
break
|
||||
if old_dan == None or self.dan > old_dan:
|
||||
if old_dan is None or self.dan > old_dan:
|
||||
self.wins_in_a_row = 0
|
||||
elif self.kyu_points < 1:
|
||||
self.kyu_points = 0
|
||||
@@ -608,7 +619,7 @@ def update_ranking(sender, instance, **kwargs):
|
||||
for user in (instance.player1, instance.player2, instance.player3, instance.player4):
|
||||
logger.debug(
|
||||
"marking %(user)s's kyu/dan for recalculation since %(start)s",
|
||||
{'user':user, 'start':str(instance.start.date())}
|
||||
{'user': user, 'start': str(instance.start.date())}
|
||||
)
|
||||
set_dirty(user=user.id, hanchan_date=instance.start.date())
|
||||
if instance.season:
|
||||
@@ -622,5 +633,6 @@ def update_ranking(sender, instance, **kwargs):
|
||||
logger.debug("marking event %s for recalculation.", instance.event)
|
||||
set_dirty(event=instance.event_id, user=user.id)
|
||||
|
||||
|
||||
models.signals.pre_delete.connect(update_ranking, sender=Hanchan)
|
||||
# models.signals.post_save.connect(update_ranking, sender=Hanchan)
|
||||
|
||||
Reference in New Issue
Block a user