diff --git a/TradingSimulation.js b/TradingSimulation.js index d38ff02c5..b87de89c5 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -345,6 +345,7 @@ record.initialBalanceB = dailyFile[i][30]; record.minimunBalanceB = dailyFile[i][31]; record.maximunBalanceB = dailyFile[i][32]; + record.baseAsset = dailyFile[i][33]; if (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) { @@ -441,6 +442,7 @@ record.initialBalanceB = marketFile[i][30]; record.minimunBalanceB = marketFile[i][31]; record.maximunBalanceB = marketFile[i][32]; + record.baseAsset = marketFile[i][33]; if (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) { @@ -848,5 +850,6 @@ + diff --git a/TradingSimulationPanel.js b/TradingSimulationPanel.js index 549ba318f..5e8dd0835 100644 --- a/TradingSimulationPanel.js +++ b/TradingSimulationPanel.js @@ -224,6 +224,11 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation /* Parameters */ let params let paramsArray = [] + let positionTaken = false + + if (currentRecord.innerRecord.positionSize > 0) { + positionTaken = true + } params = {} params.VALUE = currentRecord.innerRecord.balanceA; @@ -231,8 +236,10 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation params.MIN_VALUE = currentRecord.innerRecord.minimunBalanceA params.MAX_VALUE = currentRecord.innerRecord.maximunBalanceA params.ASSET_LABEL = 'Asset A' - params.ASSET_NAME = DEFAULT_MARKET.assetB + ' ' + params.ASSET_NAME = DEFAULT_MARKET.assetB params.LEFT_OFFSET = 100 + params.POSITION_TAKEN = positionTaken + params.BASE_ASSET = currentRecord.innerRecord.baseAsset paramsArray.push(params) @@ -242,8 +249,10 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation params.INIT_VALUE = currentRecord.innerRecord.initialBalanceB params.MAX_VALUE = currentRecord.innerRecord.maximunBalanceB params.ASSET_LABEL = 'Asset B' - params.ASSET_NAME = DEFAULT_MARKET.assetA + ' ' + params.ASSET_NAME = DEFAULT_MARKET.assetA params.LEFT_OFFSET = 220 + params.POSITION_TAKEN = positionTaken + params.BASE_ASSET = currentRecord.innerRecord.baseAsset paramsArray.push(params) @@ -269,5 +278,6 @@ function newAAMastersPlottersTradingSimulationTradingSimulationTradingSimulation +