diff --git a/TradingSimulation.js b/TradingSimulation.js index 1f0054a73..9f62fd06d 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -384,8 +384,9 @@ record.minimunBalanceB = dailyFile[i][31]; record.maximunBalanceB = dailyFile[i][32]; record.baseAsset = dailyFile[i][33]; - record.positionPeriods = dailyFile[i][34]; - record.positionDays = dailyFile[i][35]; + record.quotedAsset = dailyFile[i][34]; + record.positionPeriods = dailyFile[i][35]; + record.positionDays = dailyFile[i][36]; if ( (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) && @@ -475,8 +476,9 @@ record.minimunBalanceB = marketFile[i][31]; record.maximunBalanceB = marketFile[i][32]; record.baseAsset = marketFile[i][33]; - record.positionPeriods = marketFile[i][34]; - record.positionDays = marketFile[i][35]; + record.quotedAsset = marketFile[i][34]; + record.positionPeriods = marketFile[i][35]; + record.positionDays = marketFile[i][36]; if ( (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) && diff --git a/TradingSimulationPanel.js b/TradingSimulationPanel.js index 5d30e25d1..7eb7b9496 100644 --- a/TradingSimulationPanel.js +++ b/TradingSimulationPanel.js @@ -270,7 +270,7 @@ function newMastersPlottersTradingSimulationTradingSimulationTradingSimulationPa params.MIN_VALUE = currentRecord.minimunBalanceA params.MAX_VALUE = currentRecord.maximunBalanceA params.ASSET_LABEL = 'Asset A' - params.ASSET_NAME = DEFAULT_MARKET.assetB + params.ASSET_NAME = currentRecord.baseAsset params.LEFT_OFFSET = 100 params.POSITION_TAKEN = positionTaken params.BASE_ASSET = currentRecord.baseAsset @@ -284,7 +284,7 @@ function newMastersPlottersTradingSimulationTradingSimulationTradingSimulationPa params.INIT_VALUE = currentRecord.initialBalanceB params.MAX_VALUE = currentRecord.maximunBalanceB params.ASSET_LABEL = 'Asset B' - params.ASSET_NAME = DEFAULT_MARKET.assetA + params.ASSET_NAME = currentRecord.quotedAsset params.LEFT_OFFSET = 220 params.POSITION_TAKEN = positionTaken params.BASE_ASSET = currentRecord.baseAsset