From 72aefc9152f8cbbd9e5419ed669f8af809d7758e Mon Sep 17 00:00:00 2001
From: asepetci <asepetci@cardforge.org>
Date: Mon, 17 Feb 2014 11:03:45 +0000
Subject: [PATCH] Read rankings from cache instead of reading file every time.

---
 .../java/forge/gui/home/sanctioned/CSubmenuSealed.java    | 8 +++-----
 forge-gui/src/main/java/forge/limited/BoosterDraftAI.java | 6 +-----
 .../src/main/java/forge/limited/LimitedDeckBuilder.java   | 4 +---
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
index c28d2a0985c..2a44b725a3b 100644
--- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
+++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java
@@ -16,8 +16,8 @@ import forge.gui.toolbox.FOptionPane;
 import forge.gui.toolbox.itemmanager.ItemManagerConfig;
 import forge.item.InventoryItem;
 import forge.item.PaperCard;
+import forge.limited.DraftRankCache;
 import forge.limited.LimitedPoolType;
-import forge.limited.ReadDraftRankings;
 import forge.limited.SealedCardPoolGenerator;
 import forge.limited.SealedDeckBuilder;
 import forge.properties.ForgePreferences.FPref;
@@ -233,8 +233,6 @@ public enum CSubmenuSealed implements ICDoc {
     }
 
     static class DeckComparer implements java.util.Comparator<Deck> {
-        ReadDraftRankings ranker = new ReadDraftRankings();
-
         public double getDraftValue(Deck d) {
             double value = 0;
             double divider = 0;
@@ -248,8 +246,8 @@ public enum CSubmenuSealed implements ICDoc {
             for (Entry<PaperCard, Integer> kv : d.getMain()) {
                 PaperCard evalCard = kv.getKey();
                 int count = kv.getValue();
-                if (ranker.getRanking(evalCard.getName(), evalCard.getEdition()) != null) {
-                    double add = ranker.getRanking(evalCard.getName(), evalCard.getEdition());
+                if (DraftRankCache.getRanking(evalCard.getName(), evalCard.getEdition()) != null) {
+                    double add = DraftRankCache.getRanking(evalCard.getName(), evalCard.getEdition());
                     // System.out.println(evalCard.getName() + " is worth " + add);
                     value += add * count;
                     divider += count;
diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
index bb4d756bfb4..f2103f56dba 100644
--- a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
+++ b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java
@@ -51,7 +51,6 @@ public class BoosterDraftAI {
     private final List<List<PaperCard>> deck = new ArrayList<List<PaperCard>>();
     private final ArrayList<DeckColors> playerColors = new ArrayList<DeckColors>();
 
-    private ReadDraftRankings draftRankings;
     // roughly equivalent to 25 ranks in a core set, or 15 ranks in a small set
     private static final double TAKE_BEST_THRESHOLD = 0.1;
 
@@ -132,7 +131,7 @@ public class BoosterDraftAI {
     private List<Pair<PaperCard, Double>> rankCards(final Iterable<PaperCard> chooseFrom) {
         List<Pair<PaperCard, Double>> rankedCards = new ArrayList<Pair<PaperCard,Double>>();
         for (PaperCard card : chooseFrom) {
-            Double rkg = draftRankings.getRanking(card.getName(), card.getEdition());
+            Double rkg = DraftRankCache.getRanking(card.getName(), card.getEdition());
             if (rkg != null) {
                 rankedCards.add(MutablePair.of(card, rkg));
             } else {
@@ -174,9 +173,6 @@ public class BoosterDraftAI {
             this.deck.add(new ArrayList<PaperCard>());
             this.playerColors.add(new DeckColors());
         }
-
-        // Initialize card rankings
-        this.draftRankings = new ReadDraftRankings();
     } // BoosterDraftAI()
 
     /**
diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
index 2ac97eccf62..3729f6694de 100644
--- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
+++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
@@ -40,8 +40,6 @@ public class LimitedDeckBuilder extends DeckGeneratorBase{
     private Iterable<PaperCard> onColorCreatures;
     private Iterable<PaperCard> onColorNonCreatures;
 
-    private static ReadDraftRankings draftRankings = new ReadDraftRankings();
-
     private static final boolean logToConsole = false;
     
     /**
@@ -677,7 +675,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase{
     protected List<Pair<Double, PaperCard>> rankCards(Iterable<PaperCard> cards) {
         List<Pair<Double, PaperCard>> ranked = new ArrayList<Pair<Double, PaperCard>>();
         for (PaperCard card : cards) {
-            Double rkg = draftRankings.getRanking(card.getName(), card.getEdition());
+            Double rkg = DraftRankCache.getRanking(card.getName(), card.getEdition());
             if (rkg != null) {
                 ranked.add(Pair.of(rkg, card));
             } else {