lzc256
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[O] Handle ranking with binary search

matching
Azalea 2024-12-23 18:00:06 -05:00
parent 5b20cb316b
commit f5959925aa
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/icu/samnyan/aqua/net/games/GameApiController.kt
View File

@ -35,9 +35,11 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
playlogRepo.findByUserCardExtId(card.extId) playlogRepo.findByUserCardExtId(card.extId)
} }
// Pair<time, List<Pair<should_hide, player>>> // List<Pair<should_hide, player>>>
private var rankingCache: List<Pair<Bool, GenericRankingPlayer>> = emptyList() private var rankingCache: List<Pair<Bool, GenericRankingPlayer>> = emptyList()
private var rankingCacheLock = ReentrantLock() private var rankingCacheLock = ReentrantLock()
// Sorted index List<Rating> = Rank
private var rankingSortedIndex: List<Int> = emptyList()
@API("ranking") @API("ranking")
fun ranking(@RP token: String?): List<GenericRankingPlayer> { fun ranking(@RP token: String?): List<GenericRankingPlayer> {
val time = millis() val time = millis()
@ -100,7 +102,8 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
username = it[8]?.toString() ?: "user${it[0]}" username = it[8]?.toString() ?: "user${it[0]}"
) )
} }
logger.info("Ranking computed in ${millis() - time}ms") rankingSortedIndex = rankingCache.filter { !it.l }.map { it.r.rating }.reversed()
logger.info("Ranking for $name computed in ${millis() - time}ms")
} }
@API("playlog") @API("playlog")
@ -153,10 +156,15 @@ abstract class GameApiController<T : IUserData>(val name: String, userDataClass:
} }
} }
// Find serverRank by binary-searching in the rankingSortedIndex to find the minimal index that
// is greater than or equal to the user's rating
var serverRank = rankingSortedIndex.binarySearch(user.playerRating).let { if (it < 0) -it - 1 else it + 1 }
serverRank = rankingSortedIndex.size - serverRank
return GenericGameSummary( return GenericGameSummary(
name = user.userName, name = user.userName,
aquaUser = card.aquaUser?.publicFields, aquaUser = card.aquaUser?.publicFields,
serverRank = userDataRepo.getRanking(user.playerRating), serverRank = serverRank.long,
accuracy = plays.acc(), accuracy = plays.acc(),
rating = user.playerRating, rating = user.playerRating,
ratingHighest = user.highestRating, ratingHighest = user.highestRating,

2
src/main/java/icu/samnyan/aqua/net/games/Models.kt
View File

@ -121,8 +121,6 @@ open class BaseEntity(
interface GenericUserDataRepo<T : IUserData> : JpaRepository<T, Long> { interface GenericUserDataRepo<T : IUserData> : JpaRepository<T, Long> {
fun findByCard(card: Card): T? fun findByCard(card: Card): T?
fun findByCard_ExtId(extId: Long): Optional<T> fun findByCard_ExtId(extId: Long): Optional<T>
@Query("select count(*) from #{#entityName} e where e.playerRating > :rating and e.card.rankingBanned = false")
fun getRanking(rating: Int): Long
@Query("select e from #{#entityName} e where e.card.rankingBanned = false") @Query("select e from #{#entityName} e where e.card.rankingBanned = false")
fun findAllNonBanned(): List<T> fun findAllNonBanned(): List<T>