From 530194de0848160ab2282eea0082c9518e134ed1 Mon Sep 17 00:00:00 2001 From: MattAlexMiracle Date: Wed, 18 Jan 2023 21:27:16 +0100 Subject: [PATCH] Fix to ranking algorithm (#826) * fixed ranking * fix index error Co-authored-by: Alexander Mattick --- backend/oasst_backend/utils/ranking.py | 2 +- scripts/postprocessing/rankings.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/oasst_backend/utils/ranking.py b/backend/oasst_backend/utils/ranking.py index f6e7a31e..5538d7a3 100644 --- a/backend/oasst_backend/utils/ranking.py +++ b/backend/oasst_backend/utils/ranking.py @@ -101,7 +101,7 @@ def ranked_pairs(ranks: List[List[int]]): # order by strength of victory (using tideman's original method, don't think it would make a difference for us) sorted_majorities = [] for i in range(len(ranks[0])): - for j in range(len(ranks[i])): + for j in range(len(ranks[0])): if tallies[i, j] > 0: sorted_majorities.append((i, j, tallies[i, j])) # we don't explicitly deal with tied majorities here diff --git a/scripts/postprocessing/rankings.py b/scripts/postprocessing/rankings.py index f6e7a31e..1df6df36 100644 --- a/scripts/postprocessing/rankings.py +++ b/scripts/postprocessing/rankings.py @@ -101,7 +101,7 @@ def ranked_pairs(ranks: List[List[int]]): # order by strength of victory (using tideman's original method, don't think it would make a difference for us) sorted_majorities = [] for i in range(len(ranks[0])): - for j in range(len(ranks[i])): + for j in range(len(ranks[0])): if tallies[i, j] > 0: sorted_majorities.append((i, j, tallies[i, j])) # we don't explicitly deal with tied majorities here @@ -132,8 +132,8 @@ if __name__ == "__main__": [("w", "x", "z", "y") for _ in range(1)] + [("w", "y", "x", "z") for _ in range(2)] # + [("x","y","z","w") for _ in range(4)] - + [("x", "z", "w", "y") for _ in range(5)] - + [("y", "w", "x", "z") for _ in range(1)] + # + [("x", "z", "w", "y") for _ in range(5)] + # + [("y", "w", "x", "z") for _ in range(1)] # [("y","z","w","x") for _ in range(1000)] ) rp = ranked_pairs(ranks)