Some testing with zero volume orders
This commit is contained in:
parent
25e8aa4495
commit
3620fbcb04
@ -176,6 +176,12 @@ public abstract class OrderBook extends javax.swing.JPanel implements Exchange.B
|
|||||||
return dfm.format((double)o.getLimit());
|
return dfm.format((double)o.getLimit());
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
|
double v = o.getVolume();
|
||||||
|
if(v<=0){
|
||||||
|
System.out.printf("Order: %s %f %f\n",o.getType().toString(),o.getVolume(),o.getLimit());
|
||||||
|
// System.exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
return dfv.format((double)o.getVolume());
|
return dfv.format((double)o.getVolume());
|
||||||
//return String.format("%f", o.getVolume());
|
//return String.format("%f", o.getVolume());
|
||||||
}
|
}
|
||||||
|
@ -377,9 +377,16 @@ public class Exchange { //extends Thread {
|
|||||||
|
|
||||||
Iterator<Order> it = book.iterator();
|
Iterator<Order> it = book.iterator();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for (int i = 0; i < depth && it.hasNext(); i++) {
|
for (int i = 0; i < depth && it.hasNext(); i++) {
|
||||||
ret.add(it.next());
|
Order o=it.next();
|
||||||
|
// System.out.print(o.volume);
|
||||||
|
if (o.volume<=0)
|
||||||
|
System.exit(0);
|
||||||
|
ret.add(o);
|
||||||
}
|
}
|
||||||
|
// System.out.println();
|
||||||
tradelock.unlock();
|
tradelock.unlock();
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -521,13 +528,19 @@ public class Exchange { //extends Thread {
|
|||||||
if (a == null) {
|
if (a == null) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
tradelock.lock();
|
|
||||||
|
|
||||||
Order o = new Order(a, type, volume, limit);
|
Order o = new Order(a, type, volume, limit);
|
||||||
|
if (o.volume<=0 || o.limit<=0){
|
||||||
|
System.out.print("binweg\n");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
tradelock.lock();
|
||||||
|
|
||||||
addOrderToBook(o);
|
addOrderToBook(o);
|
||||||
a.orders.put(o.id, o);
|
a.orders.put(o.id, o);
|
||||||
|
|
||||||
this.executeOrders();
|
this.executeOrders();
|
||||||
|
|
||||||
tradelock.unlock();
|
tradelock.unlock();
|
||||||
this.updateBookReceivers(OrderType.ASK);
|
this.updateBookReceivers(OrderType.ASK);
|
||||||
this.updateBookReceivers(OrderType.BID);
|
this.updateBookReceivers(OrderType.BID);
|
||||||
|
Loading…
Reference in New Issue
Block a user