Compute win_score and average_score

server.py

@@ -90,7 +90,7 @@ class LeaderboardServer:
 
             self.submission_id_to_file[submission_id] = submission_file
 
-    def get_leaderboard(self, tournament_results=None):
+    def get_leaderboard(self, tournament_results=None, category="overall"):
         tournament_results = tournament_results if tournament_results else self.tournament_results
 
         if len(tournament_results) == 0:
@@ -113,25 +113,44 @@ class LeaderboardServer:
                     raise gr.Error(f"Proper submission [{submission_id}] not found")
 
                 local_results = {}
+                win_score = {}
                 visible_metrics_map_word_to_header = {}
                 for task in self.tasks_metadata.keys():
                     
-                    # tournament_results
-                    num_of_competitors = 0
-                    num_of_wins = 0
-                    for competitor_id in tournament_results[submission_id].keys() - {submission_id}: # without self
-                        num_of_competitors += 1
-                        if tournament_results[submission_id][competitor_id][task]:
-                            num_of_wins += 1
-                    local_results[task] = num_of_wins / num_of_competitors  # TODO: if num_of_competitors > 0 else ???
-                    
-                    for metric in VISIBLE_METRICS:
-                        visible_metrics_map_word_to_header[task + "_" + metric] = self.tasks_metadata[task]["abbreviation"] + " " + metric
-                        metric_value = data['results'][task].get(metric)
-                        if metric_value is not None:
-                            local_results[task + "_" + metric] = metric_value
-                            break  # Only the first metric of every task
-
+                    task_category = self.tasks_metadata[task]["category"]
+                    if category not in ("overall", task_category):
+                        continue
+                    else:
+                        # tournament_results
+                        num_of_competitors = 0
+                        num_of_wins = 0
+                        for competitor_id in tournament_results[submission_id].keys() - {submission_id}: # without self
+                            num_of_competitors += 1
+                            if tournament_results[submission_id][competitor_id][task]:
+                                num_of_wins += 1
+                        win_score = num_of_wins / num_of_competitors  # TODO: if num_of_competitors > 0 else ???
+                        win_score.setdefault(task_category, []).append(win_score)
+                        
+                        if category == task_category:
+                            local_results[task] = win_score
+                            for metric in VISIBLE_METRICS:
+                                visible_metrics_map_word_to_header[task + "_" + metric] = self.tasks_metadata[task]["abbreviation"] + " " + metric
+                                metric_value = data['results'][task].get(metric)
+                                if metric_value is not None:
+                                    local_results[task + "_" + metric] = metric_value
+                                    break  # Only the first metric of every task
+                
+                
+                for c in win_score:
+                    win_score[c] = sum(win_score[c]) / len(win_score[c])
+                
+                if category == "overall":
+                    for c in win_score:
+                        local_results[c] = win_score[c]
+                    local_results["average_score"] = sum(win_score[c]) / len(win_score[c])
+                else:
+                    local_results["average_score"] = win_score[category]
+                
                 model_link = data["metadata"]["link_to_model"]
                 model_title = data["metadata"]["team_name"] + "/" + data["metadata"]["model_name"]
                 model_title_abbr = self.abbreviate(data["metadata"]["team_name"], 14) + "/" + self.abbreviate(data["metadata"]["model_name"], 14)
@@ -141,8 +160,7 @@ class LeaderboardServer:
                 local_results["release"] = release
                 local_results["model_type"] = data["metadata"]["model_type"]
                 local_results["parameters"] = data["metadata"]["parameters"]
-                local_results["average_score"] = "TBD"  # TODO: Implementovat výpočet Average Score
-
+                
                 if self.pre_submit and submission_id == self.pre_submit.submission_id:
                     processed_results.insert(0, local_results)
                 else: