private Window window = null;
private JButton findMarket = null;
private JLabel resultSummary = null;
+ private JLabel arbitrageResult = null;
+ private long startTime = 0;
private final static String PCTB_LIVE_HOST_URL = "http://pctb.crabdance.com/";
private final static String PCTB_TEST_HOST_URL = "http://pctb.ilk.org/";
private boolean uploadToYarrg;
private boolean uploadToPCTB;
+ private boolean showArbitrage;
private String islandName = null;
private String oceanName = null;
}
}
};
+
+ private int parseQty(String str) {
+ if (str.equals(">1000")) {
+ return 1001;
+ } else {
+ return Integer.parseInt(str);
+ }
+ }
+
+ private void progresslog(String s) {
+ long now = new Date().getTime();
+ System.out.println("progress "+(now - startTime)+"ms "+s);
+ }
+
+ 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
commodity = commodId.intValue();
price = Integer.parseInt(record.get(priceIndex));
String qty = record.get(priceIndex+1);
- if(qty.equals(">1000")) {
- quantity = 1001;
- } else {
- quantity = Integer.parseInt(record.get(priceIndex+1));
- }
+ quantity = parseQty(qty);
shoppe = stallMap.get(record.get(1)).intValue();
}
uploadToYarrg=prefs.getBoolean("uploadToYarrg", true);
uploadToPCTB=prefs.getBoolean("uploadToPCTB", true);
+ showArbitrage=prefs.getBoolean("showArbitrage", true);
EventQueueMonitor.addTopLevelWindowListener(this);
if (EventQueueMonitor.isGUIInitialized()) {
if (window.getAccessibleContext().getAccessibleName().equals("Puzzle Pirates")) frame.setVisible(true);
return;
}
- frame = new JFrame("MarketUploader");
+ frame = new JFrame("Jarrg Uploader");
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
- frame.getContentPane().setLayout(new GridLayout(2,1));
+ GridLayout layout = new GridLayout(2,1);
+ frame.getContentPane().setLayout(layout);
//frame.setPreferredSize(new Dimension(200, 60));
findMarket = new JButton("Upload Market Data");
findMarket.setEnabled(false);
new Thread() {
public void run() {
+ startTime = new Date().getTime();
resultSummary.setText("");
+ arbitrageResult.setText("");
try {
- runPCTB();
+ runUpload();
} catch(Exception e) {
error(e.toString());
e.printStackTrace();
resultSummary = new JLabel("ready");
frame.add(resultSummary);
+ arbitrageResult = new JLabel("");
+
+ if (showArbitrage) {
+ layout.setRows(layout.getRows() + 1);
+ frame.add(arbitrageResult);
+ }
+
frame.pack();
}
*
* @exception Exception if an error we didn't expect occured
*/
- private void runPCTB() throws Exception {
+ private void runUpload() throws Exception {
+ progresslog("starting");
+
String yarrgts = "";
ProgressMonitor pm = new ProgressMonitor(frame,"Processing Market Data","Getting table data",0,100);
pm.setMillisToDecideToPopup(0);
boolean doneyarrg = false, donepctb = false;
if (uploadToYarrg) {
+ progresslog("yarrg timestamp...");
yarrgts = getYarrgTimestamp();
+ progresslog("yarrg timestamp done.");
}
AccessibleTable accesstable = findMarketTable();
return;
}
+ progresslog("getisland...");
getIsland();
+ progresslog("getocean...");
getOcean();
+ progresslog("getocean done");
if (latch != null) {
latch.await(2, java.util.concurrent.TimeUnit.SECONDS);
}
+ progresslog("table check...");
+
String headings_expected[] = new String[]
{ "Commodity", "Trading outlet", "Buy price", "Will buy", "Sell price", "Will sell" };
ArrayList<ArrayList<String>> headers = getData(accesstable.getAccessibleColumnHeader());
}
}
+ progresslog("table read...");
+
ArrayList<ArrayList<String>> data = getData(accesstable);
+ if (showArbitrage) {
+ progresslog("arbitrage...");
+ calculateArbitrage(data);
+ progresslog("arbitrage done.");
+ }
+
if (uploadToYarrg && yarrgts != null) {
- pm.setNote("Yarrg: Preparing data");
+ progresslog("yarrg prepare...");
+ progressNote(pm, "Yarrg: Preparing data");
pm.setProgress(10);
StringBuilder yarrgsb = new StringBuilder();
yarrgdata = yarrgsb.toString();
- pm.setNote("Yarrg: Uploading");
+ progressNote(pm, "Yarrg: Uploading");
+ progresslog("yarrg upload...");
if (islandName != null) {
doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
} else {
System.out.println("Couldn't upload to Yarrg - no island name found");
}
+ progresslog("yarrg done.");
}
if (uploadToPCTB) {
- pm.setNote("PCTB: Getting stall names");
+ progresslog("pctb prepare...");
+ progressNote(pm, "PCTB: Getting stall names");
pm.setProgress(20);
if(pm.isCanceled()) {
return;
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;
}
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
pm.setProgress(60);
- pm.setNote("PCTB: Sending data");
+ progressNote(pm, "PCTB: Sending data");
if(pm.isCanceled()) {
return;
}
dos.writeBytes(getAbbrevStallList(stallMap));
writeBuySellOffers(buys,sells,offerCount,out);
out.finish();
+ progresslog("pctb send...");
InputStream in = sendInitialData(new ByteArrayInputStream(outStream.toByteArray()));
+ progresslog("pctb sent.");
if (in == null) return;
pm.setProgress(80);
if(pm.isCanceled()) {
return;
}
- pm.setNote("PCTB: Waiting ...");
+ progressNote(pm, "PCTB: Waiting ...");
+ progresslog("pctb finish...");
donepctb = finishUpload(in);
+ progresslog("pctb done.");
}
pm.setProgress(100);
} else {
resultSummary.setText("uploaded nowhere!");
}
+ progresslog("done.");
}
/**
}
return true;
}
+
+ private int calculateArbitrageCommodity(ArrayList<SortedSet<int[]>> arb_bs) {
+ //System.out.println("ARBITRAGE?");
+ int profit = 0;
+ SortedSet<int[]> buys = arb_bs.get(0);
+ SortedSet<int[]> sells = arb_bs.get(1);
+ while (true) {
+ int[] buy, sell;
+ try {
+ // NB "sell" means they sell, ie we buy
+ sell = sells.last();
+ buy = buys.first();
+ } catch (NoSuchElementException e) {
+ break;
+ }
+
+ 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);
+
+ if (unitprofit <= 0)
+ break;
+
+ profit += count * unitprofit;
+ buy[1] -= count;
+ sell[1] -= count;
+ if (buy[1]==0) buys.remove(buy);
+ if (sell[1]==0) sells.remove(sell);
+ }
+ //System.out.println(" PROFIT "+profit);
+ return profit;
+ }
+
+ private class arbitrageOfferComparator implements Comparator {
+ public int compare(Object o1, Object o2) {
+ int p1 = ((int[])o1)[0];
+ int p2 = ((int[])o2)[0];
+ return p2 - p1;
+ }
+ }
+
+ private @SuppressWarnings("unchecked")
+ void calculateArbitrage(ArrayList<ArrayList<String>> data) {
+ int arbitrage = 0;
+ ArrayList<SortedSet<int[]>> arb_bs = null;
+ String lastcommod = null;
+ Comparator compar = new arbitrageOfferComparator();
+
+ for (ArrayList<String> row : data) {
+ String thiscommod = row.get(0);
+ //System.out.println("ROW "+row.toString());
+ if (lastcommod == null || !thiscommod.equals(lastcommod)) {
+ if (lastcommod != null)
+ arbitrage += calculateArbitrageCommodity(arb_bs);
+ //System.out.println("ROW rdy");
+ 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");
+ lastcommod = thiscommod;
+ }
+ for (int bs = 0; bs < 2; bs++) {
+ String pricestr = row.get(bs*2 + 2);
+ if (pricestr == null)
+ continue;
+ int[] entry = new int[2];
+ //System.out.println("ROW BS "+bs);
+ entry[0] = parseQty(pricestr);
+ entry[1] = parseQty(row.get(bs*2 + 3));
+ arb_bs.get(bs).add(entry);
+ }
+ }
+ arbitrage += calculateArbitrageCommodity(arb_bs);
+ if (arbitrage != 0) {
+ arbitrageResult.setText("<html><strong>arbitrage: "+arbitrage+" poe</strong>");
+ } else {
+ arbitrageResult.setText("no arbitrage");
+ }
+ }
}
~yarrgweb / jarrg-ian.git / blobdiff