From c003ddeeac1c9587249ecdda063c0b843c1562e8 Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Sat, 12 May 2018 22:45:49 +0100 Subject: [PATCH] Code cleanup before merge --- .../main/java/forge/view/SimulateMatch.java | 4 +- .../src/main/java/forge/deck/DeckgenUtil.java | 165 ------------------ .../tournament/system/TournamentSwiss.java | 2 +- 3 files changed, 3 insertions(+), 168 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java index 3b61ef59792..4b30c2df247 100644 --- a/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java +++ b/forge-gui-desktop/src/main/java/forge/view/SimulateMatch.java @@ -199,10 +199,10 @@ public class SimulateMatch { } Collections.reverse(log); for(GameLogEntry l : log) { - //System.out.println(l); + System.out.println(l); } - //System.out.println(String.format("\nGame %d ended in %d ms. %s has won!\n", 1+iGame, sw.getTime(), g1.getOutcome().getWinningLobbyPlayer().getName())); + System.out.println(String.format("\nGame %d ended in %d ms. %s has won!\n", 1+iGame, sw.getTime(), g1.getOutcome().getWinningLobbyPlayer().getName())); } private static void simulateTournament(Map> params, GameRules rules, boolean outputGamelog) { diff --git a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java index 04e2ed2c60a..760d220b8d2 100644 --- a/forge-gui/src/main/java/forge/deck/DeckgenUtil.java +++ b/forge-gui/src/main/java/forge/deck/DeckgenUtil.java @@ -145,49 +145,6 @@ public class DeckgenUtil { for(String cardName:uniqueCards){ selectedCards.add(StaticData.instance().getCommonCards().getUniqueByName(cardName)); } - /* - if(secondKeycard == null){ - //get second keycard - for(Map.Entry pair:potentialCards){ - preSelectedCards.add(pair.getKey()); - } - //filter out land cards and if for AI non-playable cards as potential second key cards and remove cards not legal in format - Iterable preSelectedNonLandCards; - preSelectedNonLandCards=Iterables.filter(preSelectedCards,Predicates.and( - Predicates.compose(CardRulesPredicates.IS_KEPT_IN_AI_DECKS, PaperCard.FN_GET_RULES), - Predicates.compose(CardRulesPredicates.Presets.IS_NON_LAND, PaperCard.FN_GET_RULES), - format.getFilterPrinted())); - - preSelectedCards= Lists.newArrayList(preSelectedNonLandCards); - - //choose a second card randomly from the top 8 cards if possible - int randMax=4; - if(preSelectedCards.size()> potentialSecondCards = CardRelationMatrixGenerator.cardPools.get(FModel.getFormats().getStandard().getName()).get(secondKeycard.getName()); - - //combine card distances from second key card and re-sort - if(potentialSecondCards !=null && potentialSecondCards.size()>0) { - combineDistances(potentialCards, potentialSecondCards); - Collections.sort(potentialCards, new CardDistanceComparator()); - Collections.reverse(potentialCards); - } - - List selectedCards = new ArrayList<>(); - selectedCards.add(card); - selectedCards.add(secondKeycard); - for(Map.Entry pair:potentialCards){ - PaperCard potentialCard = pair.getKey(); - if (!potentialCard.getName().equals(card.getName()) - && (forCommander || !potentialCard.getName().equals(secondKeycard.getName())) - && format.getFilterPrinted().apply(potentialCard)) { - selectedCards.add(pair.getKey()); - } - }*/ //build deck from combined list CardThemedDeckBuilder dBuilder; @@ -215,129 +172,7 @@ public class DeckgenUtil { * @return */ public static Deck buildCardGenDeck(PaperCard card, PaperCard secondKeycard, GameFormat format, boolean isForAI){ - return buildLDACardGenDeck(card, format, isForAI); - - /*List> potentialCards = new ArrayList<>(); - potentialCards.addAll(CardRelationLDAGenerator.ldaPools.get(format.getName()).get(card.getName())); - Collections.sort(potentialCards,new CardDistanceComparator()); - Collections.reverse(potentialCards); - //get second keycard - List preSelectedCards = new ArrayList<>(); - for(Map.Entry pair:potentialCards){ - preSelectedCards.add(pair.getKey()); - } - //filter out land cards and if for AI non-playable cards as potential second key cards - Iterable preSelectedNonLandCards; - if(isForAI){ - preSelectedNonLandCards=Iterables.filter(preSelectedCards,Predicates.and( - Predicates.compose(CardRulesPredicates.IS_KEPT_IN_AI_DECKS, PaperCard.FN_GET_RULES), - Predicates.compose(CardRulesPredicates.Presets.IS_NON_LAND, PaperCard.FN_GET_RULES))); - }else{ - preSelectedNonLandCards=Iterables.filter(preSelectedCards, - Predicates.compose(CardRulesPredicates.Presets.IS_NON_LAND, PaperCard.FN_GET_RULES)); - } - preSelectedCards= Lists.newArrayList(preSelectedNonLandCards); - - //choose a second card randomly from the top 8 cards if possible - if(secondKeycard == null) { - int randMax = 8; - if (preSelectedCards.size() < randMax) { - randMax = preSelectedCards.size(); - } - secondKeycard = preSelectedCards.get(MyRandom.getRandom().nextInt(randMax)); - } - - List> potentialSecondCards = CardRelationMatrixGenerator.cardPools.get(format.getName()).get(secondKeycard.getName()); - - //combine card distances from second key card and re-sort - if(potentialSecondCards !=null && potentialSecondCards.size()>0) { - combineDistances(potentialCards, potentialSecondCards); - Collections.sort(potentialCards, new CardDistanceComparator()); - Collections.reverse(potentialCards); - } - - List selectedCards = new ArrayList<>(); - for(Map.Entry pair:potentialCards){ - selectedCards.add(pair.getKey()); - } - */ - /*List toRemove = new ArrayList<>(); - Set uniqueCards = new HashSet<>(); - List selectedCards = new ArrayList<>(); - List> cardArchetypes = CardRelationLDAGenerator.ldaPools.get(FModel.getFormats().getStandard().getName()).get(card.getName()); - for(List archetype:cardArchetypes){ - for(String cardName:archetype){ - uniqueCards.add(cardName); - } - } - for(String cardName:uniqueCards){ - selectedCards.add(StaticData.instance().getCommonCards().getUniqueByName(cardName)); - } - - //randomly remove cards - int removeCount=0; - int i=0; - for(PaperCard c:selectedCards){ - if(MyRandom.getRandom().nextInt(100)>70+(15-(i/selectedCards.size())*selectedCards.size()) && removeCount<4 //randomly remove some cards - more likely as distance increases - &&!c.getName().contains("Urza")){ //avoid breaking Tron decks - toRemove.add(c); - removeCount++; - } - if(c.getName().equals(card.getName())){//may have been added in secondary list - toRemove.add(c); - } - if(c.getName().equals(secondKeycard.getName())){//remove so we can add correct amount - toRemove.add(c); - } - ++i; - } - selectedCards.removeAll(toRemove); - //Add keycard - List playsetList = new ArrayList<>(); - int keyCardCount=4; - if(card.getRules().getMainPart().getManaCost().getCMC()>7){ - keyCardCount=1+MyRandom.getRandom().nextInt(4); - }else if(card.getRules().getMainPart().getManaCost().getCMC()>5){ - keyCardCount=2+MyRandom.getRandom().nextInt(3); - } - for(int j=0;j7){ - keyCard2Count=1+MyRandom.getRandom().nextInt(4); - }else if(card.getRules().getMainPart().getManaCost().getCMC()>5){ - keyCard2Count=2+MyRandom.getRandom().nextInt(3); - } - for(int j=0;j27){ - System.out.println("Too many lands "+deck.getMain().countAll(Predicates.compose(CardRulesPredicates.Presets.IS_LAND, PaperCard.FN_GET_RULES))); - deck=buildCardGenDeck(format,isForAI); - } - while(deck.get(DeckSection.Sideboard).countAll()>15){ - deck.get(DeckSection.Sideboard).remove(deck.get(DeckSection.Sideboard).get(0)); - } - return deck;*/ } /** diff --git a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java index 56e6ce83936..a49c54fae00 100644 --- a/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java +++ b/forge-gui/src/main/java/forge/tournament/system/TournamentSwiss.java @@ -17,7 +17,7 @@ public class TournamentSwiss extends AbstractTournament { public TournamentSwiss(List allPlayers, int pairingAmount) { // Technically not 100% correct for huge tournaments, but yknow.. close enough. - super((int)Math.ceil(Math.log(allPlayers.size())/Math.log(2))*2, allPlayers); + super((int)Math.ceil(Math.log(allPlayers.size())/Math.log(2)), allPlayers); this.playersInPairing = pairingAmount; }