chiark / gitweb /
~yarrgweb / jarrg-ian.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
show arbitrage in progress dialog (which obscures where it would otherwise show up)
[jarrg-ian.git] / src / com / tedpearson / ypp / market / MarketUploader.java
diff --git a/src/com/tedpearson/ypp/market/MarketUploader.java b/src/com/tedpearson/ypp/market/MarketUploader.java
index df87f43d1d703a3ccd02da923d1f8081fad7e73d..1b111cf1494bad083bdfde5483051fd49c8d3993 100644 (file)
--- a/src/com/tedpearson/ypp/market/MarketUploader.java
+++ b/src/com/tedpearson/ypp/market/MarketUploader.java
@@ -88,6 +88,15 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                        return Integer.parseInt(str);
                }
        }
+
+        private void progressNote(ProgressMonitor pm, String s) {
+           String arb = null;
+           if (arbitrageResult != null)
+               arb = arbitrageResult.getText();
+           if (arb != null && arb.length() != 0)
+               s = "<html>" + arb + "<br>" + s;
+           pm.setNote(s);
+       }
        
        /**
        *       An abstract market offer, entailing a commodity being bought or sold by
@@ -444,7 +453,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                }
 
                if (uploadToYarrg && yarrgts != null) {
-                       pm.setNote("Yarrg: Preparing data");
+                       progressNote(pm, "Yarrg: Preparing data");
                        pm.setProgress(10);
 
                        StringBuilder yarrgsb = new StringBuilder();
@@ -464,7 +473,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
                        yarrgdata = yarrgsb.toString();
 
-                       pm.setNote("Yarrg: Uploading");
+                       progressNote(pm, "Yarrg: Uploading");
 
                        if (islandName != null) {
                                doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
@@ -474,7 +483,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                }
 
                if (uploadToPCTB) {
-                   pm.setNote("PCTB: Getting stall names");
+                   progressNote(pm, "PCTB: Getting stall names");
                    pm.setProgress(20);
                    if(pm.isCanceled()) {
                        return;
@@ -483,7 +492,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                    TreeSet<Offer> sells = new TreeSet<Offer>();
                    LinkedHashMap<String,Integer> stallMap = getStallMap(data);
                    pm.setProgress(40);
-                   pm.setNote("PCTB: Sorting offers");
+                   progressNote(pm, "PCTB: Sorting offers");
                    if(pm.isCanceled()) {
                        return;
                    }
@@ -500,7 +509,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
                    ByteArrayOutputStream outStream = new ByteArrayOutputStream();
                    pm.setProgress(60);
-                   pm.setNote("PCTB: Sending data");
+                   progressNote(pm, "PCTB: Sending data");
                    if(pm.isCanceled()) {
                        return;
                    }
@@ -518,7 +527,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                    if(pm.isCanceled()) {
                        return;
                    }
-                   pm.setNote("PCTB: Waiting ...");
+                   progressNote(pm, "PCTB: Waiting ...");
                    donepctb = finishUpload(in);
                }
                pm.setProgress(100);
@@ -997,7 +1006,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
     }
 
     private int calculateArbitrageCommodity(ArrayList<SortedSet<int[]>> arb_bs) {
-       System.out.println("ARBITRAGE?");
+       //System.out.println("ARBITRAGE?");
        int profit = 0;
        SortedSet<int[]> buys = arb_bs.get(0);
        SortedSet<int[]> sells = arb_bs.get(1);
@@ -1013,8 +1022,8 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
            int unitprofit = buy[0] - sell[0];
            int count = buy[1] < sell[1] ? buy[1] : sell[1];
-           System.out.println(" sell @"+sell[0]+" x"+sell[1]+" buy @"+buy[0]+" x"+buy[1]
-                              +" => x"+count+" @"+unitprofit);
+           //System.out.println(" sell @"+sell[0]+" x"+sell[1]+" buy @"+buy[0]+" x"+buy[1]
+           //                 +" => x"+count+" @"+unitprofit);
 
            if (unitprofit <= 0)
                break;
@@ -1025,7 +1034,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
            if (buy[1]==0) buys.remove(buy);
            if (sell[1]==0) sells.remove(sell);
        }
-       System.out.println(" PROFIT "+profit);
+       //System.out.println(" PROFIT "+profit);
        return profit;
     }
 
@@ -1037,8 +1046,8 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        }
     }
 
-    private @SuppressWarnings("unchecked") void calculateArbitrage(ArrayList<ArrayList<String>> data)
-           {
+    private @SuppressWarnings("unchecked")
+    void calculateArbitrage(ArrayList<ArrayList<String>> data) {
        int arbitrage = 0;
        ArrayList<SortedSet<int[]>> arb_bs = null;
        String lastcommod = null;
@@ -1046,7 +1055,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
 
        for (ArrayList<String> row : data) {
            String thiscommod = row.get(0);
-           System.out.println("ROW "+row.toString());
+           //System.out.println("ROW "+row.toString());
            if (lastcommod == null || !thiscommod.equals(lastcommod)) {
                if (lastcommod != null)
                    arbitrage += calculateArbitrageCommodity(arb_bs);
@@ -1054,7 +1063,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
                arb_bs = new ArrayList<SortedSet<int[]>>(2);
                arb_bs.add(0, new TreeSet<int[]>(compar));
                arb_bs.add(1, new TreeSet<int[]>(compar));
-               System.out.println("ROW init");
+               //System.out.println("ROW init");
                lastcommod = thiscommod;
            }
            for (int bs = 0; bs < 2; bs++) {
@@ -1070,7 +1079,7 @@ public class MarketUploader implements TopLevelWindowListener, GUIInitializedLis
        }
        arbitrage += calculateArbitrageCommodity(arb_bs);
        if (arbitrage != 0) {
-           arbitrageResult.setText("arbitrage: "+arbitrage+" poe");
+           arbitrageResult.setText("<html><strong>arbitrage: "+arbitrage+" poe</strong>");
        } else {
            arbitrageResult.setText("no arbitrage");
        }
JARRG main public tree