diff --git a/LowFrequencyTrading/TradingEpisode.js b/LowFrequencyTrading/TradingEpisode.js index 6483b8e30..032ae654e 100644 --- a/LowFrequencyTrading/TradingEpisode.js +++ b/LowFrequencyTrading/TradingEpisode.js @@ -9,7 +9,7 @@ exports.newTradingEpisode = function newTradingEpisode(bot, logger, tradingEngin openEpisode: openEpisode, updateExitType: updateExitType, closeEpisode: closeEpisode, - calculateStatistics: calculateStatistics, + cycleBasedStatistics: cycleBasedStatistics, initialize: initialize, finalize: finalize } @@ -113,7 +113,7 @@ exports.newTradingEpisode = function newTradingEpisode(bot, logger, tradingEngin global.ONE_DAY_IN_MILISECONDS } - function calculateStatistics() { + function cycleBasedStatistics() { calculateAssetsStatistics() calculateEpisodeStatistics() diff --git a/LowFrequencyTrading/TradingPosition.js b/LowFrequencyTrading/TradingPosition.js index d534663bc..57f67a0d2 100644 --- a/LowFrequencyTrading/TradingPosition.js +++ b/LowFrequencyTrading/TradingPosition.js @@ -6,7 +6,7 @@ exports.newTradingPosition = function newTradingPosition(bot, logger, tradingEng let thisObject = { mantain: mantain, reset: reset, - calculateStatistics: calculateStatistics, + cycleBasedStatistics: cycleBasedStatistics, openPosition: openPosition, closingPosition: closingPosition, closePosition: closePosition, @@ -256,7 +256,7 @@ exports.newTradingPosition = function newTradingPosition(bot, logger, tradingEng } } - function calculateStatistics(tradingEngineStageNode) { + function cycleBasedStatistics(tradingEngineStageNode) { calculateAssetsStatistics() calculatePositionStatistics() diff --git a/LowFrequencyTrading/TradingStages.js b/LowFrequencyTrading/TradingStages.js index 1b5090964..8a2a8ad31 100644 --- a/LowFrequencyTrading/TradingStages.js +++ b/LowFrequencyTrading/TradingStages.js @@ -7,7 +7,7 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM updateChart: updateChart, mantain: mantain, reset: reset, - calculateStatistics: calculateStatistics, + cycleBasedStatistics: cycleBasedStatistics, runTriggerStage: runTriggerStage, runOpenStage: runOpenStage, runManageStage: runManageStage, @@ -102,9 +102,9 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM resetTradingEngineDataStructure() } - function calculateStatistics() { - tradingEpisodeModule.calculateStatistics() - tradingPositionModule.calculateStatistics() + function cycleBasedStatistics() { + tradingEpisodeModule.cycleBasedStatistics() + tradingPositionModule.cycleBasedStatistics() } function runTriggerStage() { diff --git a/LowFrequencyTrading/TradingSystem.js b/LowFrequencyTrading/TradingSystem.js index b938b9a31..5ee168a04 100644 --- a/LowFrequencyTrading/TradingSystem.js +++ b/LowFrequencyTrading/TradingSystem.js @@ -132,7 +132,7 @@ exports.newTradingSystem = function newTradingSystem(bot, logger, tradingEngineM /* Run the Close Stage */ await tradingStagesModule.runCloseStage() - tradingStagesModule.calculateStatistics() + tradingStagesModule.cycleBasedStatistics() } catch (err) { /*