🏗️ Re-remove unranked concept after merge

To address issue #1 again.
ducompsoc · Sep 14, 2024 · f12bc4b · f12bc4b
1 parent 6daef34
commit f12bc4b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/server/ranking/copeland.go b/server/ranking/copeland.go
@@ -24,11 +24,11 @@ func rankingToPairwise(judgeRanking JudgeRanking) []Comparison {
 	}
 
 	// Loop through each project in the ranking and compare it to all the unranked projects
-	for _, winner := range judgeRanking.Rankings {
-		for _, loser := range judgeRanking.Unranked {
-			pairwise = append(pairwise, Comparison{winner, loser})
-		}
-	}
+	//for _, winner := range judgeRanking.Rankings {
+	//	for _, loser := range judgeRanking.Unranked {
+	//		pairwise = append(pairwise, Comparison{winner, loser})
+	//	}
+	//}
 
 	return pairwise
 }

diff --git a/server/ranking/copeland_test.go b/server/ranking/copeland_test.go
@@ -19,19 +19,19 @@ func TestCalcRanking(t *testing.T) {
 	jrs := []ranking.JudgeRanking{
 		{
 			Rankings: []primitive.ObjectID{obj1, obj5, obj3},
-			Unranked: []primitive.ObjectID{obj4, obj2},
+			//Unranked: []primitive.ObjectID{obj4, obj2},
 		},
 		{
 			Rankings: []primitive.ObjectID{obj5, obj4, obj2},
-			Unranked: []primitive.ObjectID{obj3, obj1},
+			//Unranked: []primitive.ObjectID{obj3, obj1},
 		},
 		{
 			Rankings: []primitive.ObjectID{obj1, obj5, obj2},
-			Unranked: []primitive.ObjectID{obj3, obj4},
+			//Unranked: []primitive.ObjectID{obj3, obj4},
 		},
 		{
 			Rankings: []primitive.ObjectID{obj2, obj1, obj5},
-			Unranked: []primitive.ObjectID{obj5, obj3},
+			//Unranked: []primitive.ObjectID{obj5, obj3},
 		},
 	}
 

diff --git a/server/ranking/structs.go b/server/ranking/structs.go
@@ -4,7 +4,7 @@ import "go.mongodb.org/mongo-driver/bson/primitive"
 
 type JudgeRanking struct {
 	Rankings []primitive.ObjectID `json:"rankings"`
-	Unranked []primitive.ObjectID `json:"unranked"`
+	//Unranked []primitive.ObjectID `json:"unranked"`
 }
 
 type RankedObject struct {

diff --git a/server/router/admin.go b/server/router/admin.go
@@ -439,7 +439,7 @@ func GetScores(ctx *gin.Context) {
 	}
 
 	// Calculate the scores
-	scores := ranking.CalcBordaRanking(judgeRankings, projectIds)
+	scores := ranking.CalcCopelandRanking(judgeRankings, projectIds)
 
 	// Send OK
 	ctx.JSON(http.StatusOK, scores)