Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix multi-scoring in player ranking #26

Merged
merged 1 commit into from
Feb 8, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ctfpad/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,9 @@ def total_scored_percent(self):

member_slices = []
for ctf in filter(lambda c: c.scored_points > 0, Ctf.objects.filter(visibility = "public")):
member_points = self.solved_public_challenges.filter(ctf=ctf).aggregate(Sum("points"))["points__sum"] or 0
member_points = 0
for challenge in self.solved_public_challenges.filter(ctf=ctf):
member_points += challenge.points / challenge.solvers.count()
member_slices.append(member_points / ctf.scored_points)

return round(100 * mean(member_slices), 2)
Expand Down