From 412c07a30499d2afe46ee0f34f229c6fb804abed Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 28 Oct 2023 00:17:40 +0100 Subject: [PATCH] make calcPpBoundary WAYYYYYYYY faster --- src/utils/scoresaber/scores.ts | 56 +++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/src/utils/scoresaber/scores.ts b/src/utils/scoresaber/scores.ts index db40436..9700bc3 100644 --- a/src/utils/scoresaber/scores.ts +++ b/src/utils/scoresaber/scores.ts @@ -112,6 +112,13 @@ function calcRawPpAtIdx( ); } +/** + * Gets the amount of raw pp needed to gain the expected pp + * + * @param playerId the player id + * @param expectedPp the expected pp + * @returns the pp boundary (+ per raw pp) + */ /** * Gets the amount of raw pp needed to gain the expected pp * @@ -120,38 +127,45 @@ function calcRawPpAtIdx( * @returns the pp boundary (+ per raw pp) */ export function calcPpBoundary(playerId: string, expectedPp = 1) { - const rankedScores = useScoresaberScoresStore - .getState() - .players.find((p) => p.id === playerId) - ?.scores?.filter((s) => s.score.pp !== undefined); - if (!rankedScores) return null; + const state = useScoresaberScoresStore.getState(); + const player = state.players.find((p) => p.id === playerId); + if (!player || !player.scores) return null; - const rankedScorePps = rankedScores + const rankedScorePps = player.scores + .filter((s) => s.score.pp !== undefined) .map((s) => s.score.pp) .sort((a, b) => b - a); - let idx = rankedScorePps.length - 1; + let left = 0; + let right = rankedScorePps.length - 1; + let boundaryIdx = -1; - while (idx >= 0) { - const bottomSlice = rankedScorePps.slice(idx); - const bottomPp = getTotalPpFromSortedPps(bottomSlice, idx); + while (left <= right) { + const mid = Math.floor((left + right) / 2); + const bottomSlice = rankedScorePps.slice(mid); + const bottomPp = getTotalPpFromSortedPps(bottomSlice, mid); - bottomSlice.unshift(rankedScorePps[idx]); - const modifiedBottomPp = getTotalPpFromSortedPps(bottomSlice, idx); + bottomSlice.unshift(rankedScorePps[mid]); + const modifiedBottomPp = getTotalPpFromSortedPps(bottomSlice, mid); const diff = modifiedBottomPp - bottomPp; if (diff > expectedPp) { - const ppBoundary = calcRawPpAtIdx( - rankedScorePps.slice(idx + 1), - idx + 1, - expectedPp, - ); - return ppBoundary; + boundaryIdx = mid; + left = mid + 1; + } else { + right = mid - 1; } - - idx--; } - return calcRawPpAtIdx(rankedScorePps, 0, expectedPp); + + if (boundaryIdx === -1) { + return calcRawPpAtIdx(rankedScorePps, 0, expectedPp); + } else { + return calcRawPpAtIdx( + rankedScorePps.slice(boundaryIdx + 1), + boundaryIdx + 1, + expectedPp, + ); + } } /**