diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/StandingsProducer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/BestOfOneStandingsProducer.java similarity index 99% rename from gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/StandingsProducer.java rename to gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/BestOfOneStandingsProducer.java index a501b79a0..e5dbc6105 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/StandingsProducer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/BestOfOneStandingsProducer.java @@ -6,7 +6,7 @@ import com.gempukku.util.MultipleComparator; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; -public class StandingsProducer { +public class BestOfOneStandingsProducer { private static Comparator LEAGUE_STANDING_COMPARATOR = new MultipleComparator( new DescComparator(new PointsComparator()), diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java index 21dc4cc9a..9f5937eb9 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java @@ -3,8 +3,8 @@ package com.gempukku.lotro.league; import com.gempukku.lotro.DateUtils; import com.gempukku.lotro.cards.CardSets; import com.gempukku.lotro.collection.CollectionsManager; +import com.gempukku.lotro.competitive.BestOfOneStandingsProducer; import com.gempukku.lotro.competitive.PlayerStanding; -import com.gempukku.lotro.competitive.StandingsProducer; import com.gempukku.lotro.db.LeagueDAO; import com.gempukku.lotro.db.LeagueMatchDAO; import com.gempukku.lotro.db.LeagueParticipationDAO; @@ -219,7 +219,7 @@ public class LeagueService { } private List createStandingsForMatchesAndPoints(Collection playersParticipating, Collection matches) { - return StandingsProducer.produceStandings(playersParticipating, matches, 2, 1, Collections.emptyMap()); + return BestOfOneStandingsProducer.produceStandings(playersParticipating, matches, 2, 1, Collections.emptyMap()); } public synchronized boolean canPlayRankedGame(League league, LeagueSerieData season, String player) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java index f9242f123..71b671a8b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java @@ -1,8 +1,8 @@ package com.gempukku.lotro.tournament; import com.gempukku.lotro.collection.CollectionsManager; +import com.gempukku.lotro.competitive.BestOfOneStandingsProducer; import com.gempukku.lotro.competitive.PlayerStanding; -import com.gempukku.lotro.competitive.StandingsProducer; import com.gempukku.lotro.db.vo.CollectionType; import com.gempukku.lotro.draft.DefaultDraft; import com.gempukku.lotro.draft.Draft; @@ -285,7 +285,7 @@ public class DefaultTournament implements Tournament { _lock.readLock().lock(); try { - _currentStandings = StandingsProducer.produceStandings(_players, _finishedTournamentMatches, 2, 1, _playerByes); + _currentStandings = BestOfOneStandingsProducer.produceStandings(_players, _finishedTournamentMatches, 2, 1, _playerByes); return _currentStandings; } finally { _lock.readLock().unlock(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SwissPairingMechanismTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SwissPairingMechanismTest.java index 8a99debcf..72c5aa4a2 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SwissPairingMechanismTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SwissPairingMechanismTest.java @@ -1,23 +1,24 @@ package com.gempukku.lotro.tournament; +import com.gempukku.lotro.competitive.BestOfOneStandingsProducer; import com.gempukku.lotro.competitive.PlayerStanding; -import com.gempukku.lotro.competitive.StandingsProducer; import org.apache.commons.lang.StringUtils; -import static org.junit.Assert.*; import org.junit.Test; import java.util.*; +import static org.junit.Assert.*; + public class SwissPairingMechanismTest { -// @Test -// public void testPairingLargeTournament() { -// int repeatCount = 1; -// int playerCount = 4096; -// -// for (int repeat = 0; repeat < repeatCount; repeat++) { -// testSwissPairingForPlayerCount(playerCount); -// } -// } + @Test + public void testPairingLargeTournament() { + int repeatCount = 1; + int playerCount = 4096; + + for (int repeat = 0; repeat < repeatCount; repeat++) { + testSwissPairingForPlayerCount(playerCount); + } + } @Test public void testPairingSmallTournament() { @@ -66,7 +67,7 @@ public class SwissPairingMechanismTest { for (int i = 1; i < 20; i++) { if (!pairing.isFinished(i - 1, players, droppedPlayers)) { System.out.println("Pairing round " + i); - List standings = StandingsProducer.produceStandings(players, matches, 1, 0, byes); + List standings = BestOfOneStandingsProducer.produceStandings(players, matches, 1, 0, byes); for (PlayerStanding standing : standings) { String player = standing.getPlayerName(); log(player +" points - "+standing.getPoints() + " played against: "+ StringUtils.join(previouslyPaired.get(player), ",")); @@ -105,6 +106,12 @@ public class SwissPairingMechanismTest { } } } + System.out.println("Final standings:"); + List standings = BestOfOneStandingsProducer.produceStandings(players, matches, 1, 0, byes); + for (PlayerStanding standing : standings) { + String player = standing.getPlayerName(); + System.out.println(standing.getStanding() + ". " + player + " points - " + standing.getPoints() + " played against: " + StringUtils.join(previouslyPaired.get(player), ",")); + } } private void log(String s) {