Skip to content

順位計算において不整合が起きる問題を解決 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
testusuke merged 4 commits into from
May 29, 2025
Merged

順位計算において不整合が起きる問題を解決 #93

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09fe4a1
debug: 検証コード差し込み
testusuke May 29, 2025
9ac7c9a
debug: さらに詳しいデバッグ追加
testusuke May 29, 2025
4b73a93
debug: 修正コード追加
testusuke May 29, 2025
f3d2952
fix: 順位計算問題を解決
testusuke May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions src/main/kotlin/net/sportsday/services/GamesService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@ import net.sportsday.utils.configuration.KeyValueStore
import org.jetbrains.exposed.sql.SizedCollection
import org.jetbrains.exposed.sql.transactions.transaction
import java.time.LocalDateTime
import kotlin.math.abs
import kotlin.time.Duration.Companion.minutes

private const val EPSILON = 1e-6

/**
* Created by testusuke on 2023/05/05
* @author testusuke
Expand Down Expand Up @@ -456,14 +459,18 @@ object GamesService {
if (game.calculationType == CalculationType.DIFF_SCORE || game.calculationType == CalculationType.TOTAL_SCORE) {
leagueTeamResults.values
.sortedWith(
compareByDescending<LeagueTeamResult> { it.score }
.apply {
if (game.calculationType == CalculationType.DIFF_SCORE) {
thenByDescending { it.goalDiff }
} else if (game.calculationType == CalculationType.TOTAL_SCORE) {
thenByDescending { it.goal }
}
},
when (game.calculationType) {
CalculationType.DIFF_SCORE ->
compareByDescending<LeagueTeamResult> { it.score }
.thenByDescending { it.goalDiff }

CalculationType.TOTAL_SCORE ->
compareByDescending<LeagueTeamResult> { it.score }
.thenByDescending { it.goal }

else ->
compareByDescending { it.score }
}
)
.map { leagueTeamResult ->
if (lastResult == null) {
Expand All @@ -472,17 +479,17 @@ object GamesService {
// if score is same, rank is same
if (game.calculationType == CalculationType.TOTAL_SCORE) {
if (
lastResult!!.score == leagueTeamResult.score &&
lastResult!!.goal == leagueTeamResult.goal
abs(lastResult!!.score - leagueTeamResult.score) < EPSILON &&
abs(lastResult!!.goal - leagueTeamResult.goal) < EPSILON
) {
leagueTeamResult.rank = lastRank
} else {
leagueTeamResult.rank = lastRank + 1
}
} else {
if (
lastResult!!.score == leagueTeamResult.score &&
lastResult!!.goalDiff == leagueTeamResult.goalDiff
abs(lastResult!!.score - leagueTeamResult.score) < EPSILON &&
abs(lastResult!!.goalDiff - leagueTeamResult.goalDiff) < EPSILON
) {
leagueTeamResult.rank = lastRank
} else {
Expand All @@ -504,7 +511,7 @@ object GamesService {
if (lastResult == null) {
leagueTeamResult.rank = 1
} else {
if (lastResult!!.score == leagueTeamResult.score) {
if (abs(lastResult!!.score - leagueTeamResult.score) < EPSILON) {
leagueTeamResult.rank = lastRank
} else {
leagueTeamResult.rank = lastRank + 1
Expand Down
Loading