diff --git a/src/opensesim/world/Account.java b/src/opensesim/world/Account.java index c1ead52..3021e6c 100644 --- a/src/opensesim/world/Account.java +++ b/src/opensesim/world/Account.java @@ -32,42 +32,51 @@ import org.json.JSONObject; /** * Class to hold account data of traders + * * @author 7u83 <7u83@mail.ru> */ public class Account { - HashMap assets = new HashMap<>(); - HashMap assets_avail = new HashMap<>(); - - Trader owner; - Exchange exchange=null; - public Map getAssets() { - return Collections.unmodifiableMap(assets); + HashMap assets = new HashMap<>(); + HashMap assets_avail = new HashMap<>(); + + Trader owner; + Exchange exchange = null; + + public Map getAssets() { + return Collections.unmodifiableMap(assets); + } + + public Map getAssetsAavail() { + return Collections.unmodifiableMap(assets_avail); } public Trader getOwner() { return owner; } - - protected Account(Exchange exchange){ + + protected Account(Exchange exchange) { this.exchange = exchange; } - - protected Account(Exchange exchange, JSONObject cfg){ + + protected Account(Exchange exchange, JSONObject cfg) { this.exchange = exchange; } - - Account(){ - + + Account() { + } - - void add(AssetPack pack){ - assets.put( pack.asset, get(pack.asset)+pack.volume); - assets_avail.put( pack.asset, get(pack.asset)+pack.volume); + + void add(AssetPack pack) { + assets.put(pack.asset, get(pack.asset) + pack.volume); + assets_avail.put(pack.asset, getAvail(pack.asset) + pack.volume); } - - public double get(AbstractAsset asset){ - return assets.getOrDefault(asset, 0.0); + + public double get(AbstractAsset asset) { + return assets.getOrDefault(asset, 0.0); + } + + public double getAvail(AbstractAsset asset) { + return assets_avail.getOrDefault(asset, 0.0); } - }