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

Added ERROR status and message String with getter and setter

This commit is contained in:
7u83 2019-01-02 20:03:55 +01:00
parent 0cedbbc3d4
commit fcdae01a8b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opensesim/world/Account.java
View File

@ -42,6 +42,8 @@ public class Account {
HashMap<AbstractAsset, Double> assets = new HashMap<>();
HashMap<AbstractAsset, Double> assets_avail = new HashMap<>();
public double margin_bound=0.0;
Trader owner;
//public Exchange exchange = null;
@ -93,7 +95,7 @@ public class Account {
}
public Double getMargin(AbstractAsset currency) {
return this.getFinalBalance(currency) * getLeverage()
return this.getFinalBalance(currency) * getLeverage() + this.getFinalBalance(currency)
- this.getAssetDebt(world.getDefaultExchange(), currency);
}
@ -209,7 +211,7 @@ public class Account {
* @return Balance
*/
public Double getFinalBalance() {
return getFinalBalance(world.getDefaultAssetPair().getCurrency());
return getFinalBalance(world.getDefaultCurrency());
}
public Double calcStopLoss(Exchange ex, AbstractAsset asset, AbstractAsset currency) {