From f0e661d13f5ee1687ccacd72f7a184da050df772 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 13 Aug 2020 13:18:38 +0200 Subject: [PATCH] Before Romoving Initial Definition --- LowFrequencyTrading/TradingPosition.js | 4 ++++ LowFrequencyTrading/TradingStages.js | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LowFrequencyTrading/TradingPosition.js b/LowFrequencyTrading/TradingPosition.js index 43b85e7a5..1dbc6cc98 100644 --- a/LowFrequencyTrading/TradingPosition.js +++ b/LowFrequencyTrading/TradingPosition.js @@ -71,6 +71,10 @@ exports.newTradingPosition = function newTradingPosition(bot, logger, tradingEng /* Inicializing this counter */ tradingEngine.current.episode.distanceToEvent.takePosition.value = 1 + + /* Remember the balance we had before taking the position to later calculate profit or loss */ + tradingEngine.current.position.positionBaseAsset.beginBalance = tradingEngine.current.episode.episodeBaseAsset.balance.value + tradingEngine.current.position.positionQuotedAsset.beginBalance = tradingEngine.current.episode.episodeQuotedAsset.balance.value } function closingPosition(exitType) { diff --git a/LowFrequencyTrading/TradingStages.js b/LowFrequencyTrading/TradingStages.js index a38245d34..7961ac29b 100644 --- a/LowFrequencyTrading/TradingStages.js +++ b/LowFrequencyTrading/TradingStages.js @@ -282,10 +282,6 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM tradingSystem.evalConditions(tradingSystemStage, 'Initial Definition') tradingSystem.evalFormulas(tradingSystemStage, 'Initial Definition') - /* Remember the balance we had before taking the position to later calculate profit or loss */ - tradingEngine.current.position.positionBaseAsset.beginBalance = tradingEngine.current.episode.episodeBaseAsset.balance.value - tradingEngine.current.position.positionQuotedAsset.beginBalance = tradingEngine.current.episode.episodeQuotedAsset.balance.value - /* Entry Position size and rate */ tradingSystem.evalFormulas(tradingSystemStage, 'Initial Targets') tradingPositionModule.initialTargets(tradingSystemStage, tradingEngine.current.strategyOpenStage)