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 AccessibleContext sidePanel;
private HashMap<String,Integer> commodMap;
+ public PrintStream dtxt = null;
private PropertyChangeListener changeListener = new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent e) {
int index = text.indexOf(":");
String name = text.substring(0,index);
islandName = name;
- //System.out.println(islandName);
+ // if (dtxt!=null) dtxt.println(islandName);
sidePanel.removePropertyChangeListener(this);
latch.countDown();
}
}
}
+ private void progresslog(String s) {
+ if (dtxt == null) return;
+ long now = new Date().getTime();
+ dtxt.println("progress "+(now - startTime)+"ms "+s);
+ }
+
private void progressNote(ProgressMonitor pm, String s) {
String arb = null;
if (arbitrageResult != null)
// check if we've been turned off in the control panel
Preferences prefs = Preferences.userNodeForPackage(getClass());
+ if (prefs.getBoolean("writeDebugFiles", false)) {
+ try {
+ dtxt = new PrintStream(new File("jarrg-debug-log.txt"));
+ } catch (java.io.FileNotFoundException e) {
+ System.err.println("JARRG: Error opening debug log: "+e);
+ }
+ }
+
if (prefs.getBoolean("useLiveServers", false)) {
YARRG_URL = YARRG_LIVE_URL;
PCTB_HOST_URL = PCTB_LIVE_HOST_URL;
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();
html = m.replaceAll(" ");
}
String whole_msg = "<html><h1>Error</h1>"+msg+"<h1>PCTB Server said:</h1><blockquote>"+html+"</blockquote>";
- System.err.println("###" + whole_msg + "###");
+ if (dtxt!=null) dtxt.println("###" + whole_msg + "###");
JOptionPane.showMessageDialog(frame,whole_msg,"Error",JOptionPane.ERROR_MESSAGE);
}
*
* @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);
}
+ if (islandName == null) {
+ error("Could not find island name in YPP user interface.");
+ return;
+ }
+
+ 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) {
+ progresslog("yarrg prepare...");
progressNote(pm, "Yarrg: Preparing data");
pm.setProgress(10);
yarrgdata = yarrgsb.toString();
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");
- }
+ doneyarrg = runYarrg(yarrgts, oceanName, islandName, yarrgdata);
+ progresslog("yarrg done.");
}
if (uploadToPCTB) {
+ progresslog("pctb prepare...");
progressNote(pm, "PCTB: Getting stall names");
pm.setProgress(20);
if(pm.isCanceled()) {
}
int[] offerCount = getBuySellMaps(data,buys,sells,stallMap,commodMap);
//println(buys.toString());
- //System.out.println(sells);
- //System.out.println("\n\n\n"+buys);
+ // if (dtxt!=null) dtxt.println(sells);
+ // if (dtxt!=null) dtxt.println("\n\n\n"+buys);
ByteArrayOutputStream outStream = new ByteArrayOutputStream();
pm.setProgress(60);
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;
}
progressNote(pm, "PCTB: Waiting ...");
+ progresslog("pctb finish...");
donepctb = finishUpload(in);
+ progresslog("pctb done.");
}
pm.setProgress(100);
} else {
resultSummary.setText("uploaded nowhere!");
}
+ progresslog("done.");
}
/**
Accessible node1 = window;
Accessible node = descendNodes(node1,new int[] {0,1,0,0,0,0,1,0,0,1,0,0}); // commod market
// commod market: {0,1,0,0,0,0,1,0,0,1,0} {0,1,0,0,0,0,1,0,1,0,0,1,0,0})
- //System.out.println(node);
+ // if (dtxt!=null) dtxt.println(node);
if (!(node instanceof JTable)) {
node = descendNodes(node1,new int[] {0,1,0,0,0,0,1,0,1,0,0,1,0,0}); // commod market
}
if (!(node instanceof JTable)) return null;
AccessibleTable table = node.getAccessibleContext().getAccessibleTable();
- //System.out.println(table);
+ // if (dtxt!=null) dtxt.println(table);
return table;
}
private Accessible descendNodes(Accessible parent, int[] path) {
for(int i=0;i<path.length;i++) {
if (null == (parent = descend(parent, path[i]))) return null;
- // System.out.println(parent.getClass());
+ // if (dtxt!=null) dtxt.println(parent.getClass());
}
return parent;
}
int first = sb.indexOf("<pre>") + 5;
int last = sb.indexOf("</body>");
xml = sb.substring(first,last);
- //System.out.println(xml);
+ //if (dtxt!=null) {
+ // dtxt.println(">>");
+ // dtxt.println(sb);;
+ // dtxt.println("||");
+ // dtxt.println(xml);
+ // dtxt.println("<<");
+ //}
+ // if (dtxt!=null) dtxt.println(xml);
Reader reader = new CharArrayReader(xml.toCharArray());
Document d = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new InputSource(reader));
NodeList maps = d.getElementsByTagName("CommodMap");
buySellCount[1]++;
}
} catch(IllegalArgumentException e) {
- System.err.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
+ if (dtxt!=null) dtxt.println("Error: Unsupported Commodity \"" + offer.get(0) + "\"");
}
}
if (buySellCount[0]==0 && buySellCount[1]==0) {
*/
private boolean finishUpload(InputStream in) throws IOException {
String html = readstreamstring(in);
- //System.out.println(html);
+ // if (dtxt!=null) dtxt.println(html);
Matcher m;
Pattern params = Pattern.compile("(?s)<input type=\"hidden\" name=\"action\" value=\"setisland\" />.+?<input type=\"hidden\" name=\"forcereload\" value=\"([^\"]+)\" />.+?<input type=\"hidden\" name=\"filename\" value=\"([^\"]+)\" />");
Pattern done = Pattern.compile("Your data has been integrated into the database. Thank you!");
m = done.matcher(complete);
if(m.find()) {
- System.out.println("FILE upload successful!!!");
+ if (dtxt!=null) dtxt.println("FILE upload successful!!!");
return true;
} else {
error_html("Something was wrong with the final upload parameters!", complete);
BufferedReader br = new BufferedReader(new InputStreamReader(in));
String yarrgresult;
while((yarrgresult = br.readLine()) != null) {
- System.out.println(yarrgresult);
+ if (dtxt!=null) dtxt.println(yarrgresult);
}
return true;
}
private int calculateArbitrageCommodity(ArrayList<SortedSet<int[]>> arb_bs) {
- //System.out.println("ARBITRAGE?");
+ // if (dtxt!=null) dtxt.println("ARBITRAGE?");
int profit = 0;
SortedSet<int[]> buys = arb_bs.get(0);
SortedSet<int[]> sells = arb_bs.get(1);
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]
+ // if (dtxt!=null) dtxt.println(" sell @"+sell[0]+" x"+sell[1]+" buy @"+buy[0]+" x"+buy[1]
// +" => x"+count+" @"+unitprofit);
if (unitprofit <= 0)
if (buy[1]==0) buys.remove(buy);
if (sell[1]==0) sells.remove(sell);
}
- //System.out.println(" PROFIT "+profit);
+ // if (dtxt!=null) dtxt.println(" PROFIT "+profit);
return profit;
}
for (ArrayList<String> row : data) {
String thiscommod = row.get(0);
- //System.out.println("ROW "+row.toString());
+ // if (dtxt!=null) dtxt.println("ROW "+row.toString());
if (lastcommod == null || !thiscommod.equals(lastcommod)) {
if (lastcommod != null)
arbitrage += calculateArbitrageCommodity(arb_bs);
- //System.out.println("ROW rdy");
+ // if (dtxt!=null) dtxt.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");
+ // if (dtxt!=null) dtxt.println("ROW init");
lastcommod = thiscommod;
}
for (int bs = 0; bs < 2; bs++) {
if (pricestr == null)
continue;
int[] entry = new int[2];
- //System.out.println("ROW BS "+bs);
+ // if (dtxt!=null) dtxt.println("ROW BS "+bs);
entry[0] = parseQty(pricestr);
entry[1] = parseQty(row.get(bs*2 + 3));
arb_bs.get(bs).add(entry);
~yarrgweb / jarrg-ian.git / blobdiff