Account for ties in leaderboards

index.md

@@ -11,7 +11,7 @@ The Repeater Roundabout is a weekend-long event held on many of our local repeat
 
 Anyone with a ham radio license can participate ! You don't even have to be local; stations may participate over Echolink, Allstar, or IRLP if they are available.
 
-> This page was last updated on Sunday November 19 at 12:00.
+> This page was last updated on Monday November 20 at 09:41.
 
 ---
 

scripts/score.py

@@ -269,7 +269,6 @@ def score_competition(
             }
         )
     )
-    leaderboard.index = leaderboard.index + 1
     leaderboard["Callsign"] = leaderboard["Callsign"].apply(
         lambda call: f"[{call}](/results/{call})"
     )
@@ -286,6 +285,9 @@ def score_competition(
     ]
     leaderboard["Full House"] = leaderboard["Full House"].apply(lambda x: "X" if x else "")
 
+    # Set a new index with leaderboard positions, but accounting for ties
+    leaderboard.index = leaderboard["Total Score"].rank(method='min', ascending=False).astype(int)
+
     # Merge all logs with repeater data
     repeater_cols = ["RR#", "Long Name", "Output (MHz)", "Location", "Website"]
     logs_df = (
@@ -323,7 +325,7 @@ def score_competition(
         .reset_index(drop=True)
         .round({"Readability": 2})
     )
-    by_repeater.index = by_repeater.index + 1
+    by_repeater.index = by_repeater["Activations"].rank(method='min', ascending=False).astype(int)
     by_repeater["Frequency"] = by_repeater["Frequency"].apply(at_least_three_decimals)
 
     # Calculate the number of activations per club
@@ -334,7 +336,7 @@ def score_competition(
         .sort_values(["Activations", "Group"], ascending=[False, True])
         .reset_index(drop=False)  # index contains the club name
     )
-    by_club.index = by_club.index + 1
+    by_club.index = by_club["Activations"].rank(method='min', ascending=False).astype(int)
 
     # Some stats :
     total_contacts = sum([scores["Total Contacts"] for scores in contest_scores.values()])