From 750c6084ccd071c3360e1bdf2fe3007c5292c5ee Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 19 May 2020 20:15:29 +0200 Subject: [PATCH] refactoring done --- TradingSimulation.js | 130 ++++++++++++------------- TradingSimulationAssetBalancesPanel.js | 8 +- 2 files changed, 68 insertions(+), 70 deletions(-) diff --git a/TradingSimulation.js b/TradingSimulation.js index 44cddb7bb..8f86d0886 100644 --- a/TradingSimulation.js +++ b/TradingSimulation.js @@ -353,39 +353,38 @@ record.begin = dailyFile[i][0]; record.end = dailyFile[i][1]; - record.amount = dailyFile[i][2]; - record.balanceA = dailyFile[i][3]; - record.balanceB = dailyFile[i][4]; - record.accumulatedProfitLoss = dailyFile[i][5]; - record.lastTradeProfitLoss = dailyFile[i][6]; - record.stopLoss = dailyFile[i][7]; - record.tradesCount = dailyFile[i][8]; - record.hits = dailyFile[i][9]; - record.fails = dailyFile[i][10]; - record.hitRatio = dailyFile[i][11]; - record.ROI = dailyFile[i][12]; - record.periods = dailyFile[i][13]; - record.days = dailyFile[i][14]; - record.anualizedRateOfReturn = dailyFile[i][15]; - record.sellRate = dailyFile[i][16]; - record.lastTradeROI = dailyFile[i][17]; - record.strategy = dailyFile[i][18]; - record.takeProfit = dailyFile[i][19]; - record.stopLossPhase = dailyFile[i][20]; - record.takeProfitPhase = dailyFile[i][21]; - record.positionSize = dailyFile[i][22]; // 25 is the message for the executor - record.initialBalanceA = dailyFile[i][23]; - record.minimunBalanceA = dailyFile[i][24]; - record.maximunBalanceA = dailyFile[i][25]; - record.initialBalanceB = dailyFile[i][26]; - record.minimunBalanceB = dailyFile[i][27]; - record.maximunBalanceB = dailyFile[i][28]; - record.baseAsset = dailyFile[i][29]; - record.quotedAsset = dailyFile[i][30]; - record.marketBaseAsset = dailyFile[i][31]; - record.marketQuotedAsset = dailyFile[i][32]; - record.positionPeriods = dailyFile[i][33]; - record.positionDays = dailyFile[i][34]; + record.balanceBaseAsset = dailyFile[i][2]; + record.balanceQuotedAsset = dailyFile[i][3]; + record.accumulatedProfitLoss = dailyFile[i][4]; + record.lastTradeProfitLoss = dailyFile[i][5]; + record.stopLoss = dailyFile[i][6]; + record.tradesCount = dailyFile[i][7]; + record.hits = dailyFile[i][8]; + record.fails = dailyFile[i][9]; + record.hitRatio = dailyFile[i][10]; + record.ROI = dailyFile[i][11]; + record.periods = dailyFile[i][12]; + record.days = dailyFile[i][13]; + record.anualizedRateOfReturn = dailyFile[i][14]; + record.sellRate = dailyFile[i][15]; + record.lastTradeROI = dailyFile[i][16]; + record.strategy = dailyFile[i][17]; + record.takeProfit = dailyFile[i][18]; + record.stopLossPhase = dailyFile[i][19]; + record.takeProfitPhase = dailyFile[i][20]; + record.positionSize = dailyFile[i][21]; // 25 is the message for the executor + record.initialBalanceA = dailyFile[i][22]; + record.minimunBalanceA = dailyFile[i][23]; + record.maximunBalanceA = dailyFile[i][24]; + record.initialBalanceB = dailyFile[i][25]; + record.minimunBalanceB = dailyFile[i][26]; + record.maximunBalanceB = dailyFile[i][27]; + record.baseAsset = dailyFile[i][28]; + record.quotedAsset = dailyFile[i][29]; + record.marketBaseAsset = dailyFile[i][30]; + record.marketQuotedAsset = dailyFile[i][31]; + record.positionPeriods = dailyFile[i][32]; + record.positionDays = dailyFile[i][33]; if ( (record.begin >= farLeftDate.valueOf() && record.end <= farRightDate.valueOf()) && @@ -444,39 +443,38 @@ record.begin = marketFile[i][0]; record.end = marketFile[i][1]; - record.amount = marketFile[i][2]; - record.balanceA = marketFile[i][3]; - record.balanceB = marketFile[i][4]; - record.accumulatedProfitLoss = marketFile[i][5]; - record.lastTradeProfitLoss = marketFile[i][6]; - record.stopLoss = marketFile[i][7]; - record.tradesCount = marketFile[i][8]; - record.hits = marketFile[i][9]; - record.fails = marketFile[i][10]; - record.hitRatio = marketFile[i][11]; - record.ROI = marketFile[i][12]; - record.periods = marketFile[i][13]; - record.days = marketFile[i][14]; - record.anualizedRateOfReturn = marketFile[i][15]; - record.sellRate = marketFile[i][16]; - record.lastTradeROI = marketFile[i][17]; - record.strategy = marketFile[i][18]; - record.takeProfit = marketFile[i][19]; - record.stopLossPhase = marketFile[i][20]; - record.takeProfitPhase = marketFile[i][21]; - record.positionSize = marketFile[i][22]; - record.initialBalanceA = marketFile[i][23]; - record.minimunBalanceA = marketFile[i][24]; - record.maximunBalanceA = marketFile[i][25]; - record.initialBalanceB = marketFile[i][26]; - record.minimunBalanceB = marketFile[i][27]; - record.maximunBalanceB = marketFile[i][28]; - record.baseAsset = marketFile[i][29]; - record.quotedAsset = marketFile[i][30]; - record.marketBaseAsset = marketFile[i][31]; - record.marketQuotedAsset = marketFile[i][32]; - record.positionPeriods = marketFile[i][33]; - record.positionDays = marketFile[i][34]; + record.balanceBaseAsset = marketFile[i][2]; + record.balanceQuotedAsset = marketFile[i][3]; + record.accumulatedProfitLoss = marketFile[i][4]; + record.lastTradeProfitLoss = marketFile[i][5]; + record.stopLoss = marketFile[i][6]; + record.tradesCount = marketFile[i][7]; + record.hits = marketFile[i][8]; + record.fails = marketFile[i][9]; + record.hitRatio = marketFile[i][10]; + record.ROI = marketFile[i][11]; + record.periods = marketFile[i][12]; + record.days = marketFile[i][13]; + record.anualizedRateOfReturn = marketFile[i][14]; + record.sellRate = marketFile[i][15]; + record.lastTradeROI = marketFile[i][16]; + record.strategy = marketFile[i][17]; + record.takeProfit = marketFile[i][18]; + record.stopLossPhase = marketFile[i][19]; + record.takeProfitPhase = marketFile[i][20]; + record.positionSize = marketFile[i][21]; + record.initialBalanceA = marketFile[i][22]; + record.minimunBalanceA = marketFile[i][23]; + record.maximunBalanceA = marketFile[i][24]; + record.initialBalanceB = marketFile[i][25]; + record.minimunBalanceB = marketFile[i][26]; + record.maximunBalanceB = marketFile[i][27]; + record.baseAsset = marketFile[i][28]; + record.quotedAsset = marketFile[i][29]; + record.marketBaseAsset = marketFile[i][30]; + record.marketQuotedAsset = marketFile[i][31]; + record.positionPeriods = marketFile[i][32]; + record.positionDays = marketFile[i][33]; if ( (record.begin >= leftDate.valueOf() && record.end <= rightDate.valueOf()) && diff --git a/TradingSimulationAssetBalancesPanel.js b/TradingSimulationAssetBalancesPanel.js index 7272577da..d9e69a743 100644 --- a/TradingSimulationAssetBalancesPanel.js +++ b/TradingSimulationAssetBalancesPanel.js @@ -156,7 +156,7 @@ function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimul if (currentRecord.baseAsset === currentRecord.marketBaseAsset) { params = {} - params.VALUE = currentRecord.balanceA; + params.VALUE = currentRecord.balanceBaseAsset; params.INIT_VALUE = currentRecord.initialBalanceA params.MIN_VALUE = currentRecord.minimunBalanceA params.MAX_VALUE = currentRecord.maximunBalanceA @@ -170,7 +170,7 @@ function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimul paramsArray.push(params) params = {} - params.VALUE = currentRecord.balanceB; + params.VALUE = currentRecord.balanceQuotedAsset; params.MIN_VALUE = currentRecord.minimunBalanceB params.INIT_VALUE = currentRecord.initialBalanceB params.MAX_VALUE = currentRecord.maximunBalanceB @@ -184,7 +184,7 @@ function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimul paramsArray.push(params) } else { params = {} - params.VALUE = currentRecord.balanceB; + params.VALUE = currentRecord.balanceQuotedAsset; params.INIT_VALUE = currentRecord.initialBalanceB params.MIN_VALUE = currentRecord.minimunBalanceB params.MAX_VALUE = currentRecord.maximunBalanceB @@ -198,7 +198,7 @@ function newTradingEnginesPlottersTradingSimulationTradingSimulationTradingSimul paramsArray.push(params) params = {} - params.VALUE = currentRecord.balanceA; + params.VALUE = currentRecord.balanceBaseAsset; params.MIN_VALUE = currentRecord.minimunBalanceA params.INIT_VALUE = currentRecord.initialBalanceA params.MAX_VALUE = currentRecord.maximunBalanceA