ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename standings producer.

Browse Source
This commit is contained in:
marcins78
2013-09-11 13:12:43 +00:00
parent d52541aaca
commit 3c7d87e032
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/StandingsProducer.java → gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/competitive/BestOfOneStandingsProducer.java
View File

@@ -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<PlayerStanding> LEAGUE_STANDING_COMPARATOR =
new MultipleComparator<PlayerStanding>(
new DescComparator<PlayerStanding>(new PointsComparator()),

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/LeagueService.java
View File

@@ -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<PlayerStanding> createStandingsForMatchesAndPoints(Collection<String> playersParticipating, Collection<LeagueMatchResult> matches) {
return StandingsProducer.produceStandings(playersParticipating, matches, 2, 1, Collections.<String, Integer>emptyMap());
return BestOfOneStandingsProducer.produceStandings(playersParticipating, matches, 2, 1, Collections.<String, Integer>emptyMap());
}
public synchronized boolean canPlayRankedGame(League league, LeagueSerieData season, String player) {

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DefaultTournament.java
View File

@@ -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();

31
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/tournament/SwissPairingMechanismTest.java
View File

@@ -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<PlayerStanding> standings = StandingsProducer.produceStandings(players, matches, 1, 0, byes);
List<PlayerStanding> 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<PlayerStanding> 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) {