7u83/OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

work on graphics

Browse Source
This commit is contained in:
7u83
2017-01-08 03:25:18 +01:00
parent 74dc584984
commit 36c1826778
4 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/sesim/Exchange.java
View File

@ -249,18 +249,18 @@ public class Exchange extends Thread {
long nextQuoteId = 0;
public void OrderMatching() {
private void executeOrders() {
while (true) {
if (bid.isEmpty() || ask.isEmpty()) {
// nothing to do
return;
}
while (!bid.isEmpty() && !ask.isEmpty()) {
Order b = bid.first();
Order a = ask.first();
if (b.limit < a.limit) {
// no match, nothing to do
return;
}
if (a.volume == 0) {
// This order is fully executed, remove
a.account.orderpending = false;
@ -283,13 +283,10 @@ public class Exchange extends Thread {
continue;
}
if (b.limit < a.limit) {
// no match, nothing to do
return;
}
if (b.limit >= a.limit) {
double price;
price = b.id<a.id ? b.limit : a.limit;
if (b.id < a.id) {
price = b.limit;
@ -389,7 +386,7 @@ public class Exchange extends Thread {
o.id = orderid++;
addOrder(o);
o.account.pending.add(o);
OrderMatching();
executeOrders();
tradelock.unlock();
return o;
@ -405,7 +402,7 @@ public class Exchange extends Thread {
Unlock();
Lock();
// OrderMatching();
// executeOrders();
Unlock();
}