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

no account checking (for test only)

Browse Source
This commit is contained in:
7u83 2019-01-01 14:23:01 +01:00
parent 0b62def911
commit a1c1196ba1
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/opensesim/world/TradingEngine.java
View File

@ -289,9 +289,8 @@ class TradingEngine implements TradingAPI {
// For sellers there is no need to update. // For sellers there is no need to update.
double avdiff = b.limit * volume - price * volume; double avdiff = b.limit * volume - price * volume;
b.account.addAvail(assetpair.getCurrency(), avdiff); b.account.addAvail(assetpair.getCurrency(), avdiff);
// b.account.addMarginAvail(assetpair.getCurrency(), avdiff/b.account.getLeverage());
// b.account.addMarginAvail(assetpair.getCurrency(), avdiff/b.account.getLeverage());
finishTrade(b, a, price, volume); finishTrade(b, a, price, volume);
if (!compact_history) { if (!compact_history) {
@ -433,20 +432,18 @@ class TradingEngine implements TradingAPI {
case BUYLIMIT: { case BUYLIMIT: {
// verfify available currency for a buy limit order // verfify available currency for a buy limit order
AbstractAsset currency = this.assetpair.getCurrency(); AbstractAsset currency = this.assetpair.getCurrency();
Double avail = 0.0; ///account.getMarginAvail(currency);
Double avail = account.getMargin(assetpair.getCurrency());
Double margin = account.getValue(assetpair.getCurrency());
// return if not enough money is available // return if not enough money is available
if (avail * account.getLeverage() < v * l) { if (avail < v * l) {
// return null; // return null;
} }
// reduce the available money // reduce the available money
// account.assets_avail.put(currency, avail - v * l); // account.assets_avail.put(currency, avail - v * l);
account.addAvail(currency, -(v * l)); account.addAvail(currency, -(v * l));
//account.addMarginAvail(currency, -((v * l)/account.getLeverage())); //account.addMarginAvail(currency, -((v * l)/account.getLeverage()));
order_limit = l; order_limit = l;
break; break;
@ -482,7 +479,7 @@ account.addAvail(currency, -(v * l));
if (avail < v) { if (avail < v) {
// not enough items of asset (shares) available // not enough items of asset (shares) available
return null; // return null;
} }
account.assets_avail.put(asset, avail - v); account.assets_avail.put(asset, avail - v);
order_limit = l; order_limit = l;
@ -504,7 +501,7 @@ account.addAvail(currency, -(v * l));
} }
} }
executeOrders(); executeOrders();
last_quote.price=200; // last_quote.price = 200;
for (FiringEvent e : book_listener) { for (FiringEvent e : book_listener) {
e.fire(); e.fire();
} }