From 707239e68442e02d62c96b5af0312415913e0ca5 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 4 Jun 2020 10:49:56 +0200 Subject: [PATCH] Until take position now --- Trading/TradingEngine.js | 58 +++++++++++- Trading/TradingSimulation.js | 175 ++++------------------------------- Trading/TradingSystem.js | 156 ++++++++++++++++++++++++++++++- 3 files changed, 222 insertions(+), 167 deletions(-) diff --git a/Trading/TradingEngine.js b/Trading/TradingEngine.js index 30207da99..d856b0c38 100644 --- a/Trading/TradingEngine.js +++ b/Trading/TradingEngine.js @@ -3,23 +3,29 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) { const MODULE_NAME = 'Trading Engine' let thisObject = { + updatePositionCounters: updatePositionCounters, + updateDistanceToEventsCounters: updateDistanceToEventsCounters, initialize: initialize, finalize: finalize } + let tradingEngine + return thisObject function initialize() { /* Here we will go through all the nodes in the Trading Engine hiriarchy and apply the initial value to the value property when needed */ - if (bot.TRADING_ENGINE.isInitialized !== true || bot.RESUME === false) { - bot.TRADING_ENGINE.isInitialized = true - initializeNode(bot.TRADING_ENGINE) + tradingEngine = bot.TRADING_ENGINE + + if (tradingEngine.isInitialized !== true || bot.RESUME === false) { + tradingEngine.isInitialized = true + initializeNode(tradingEngine) } } function finalize() { - + tradingEngine = undefined } function initializeNode(node) { @@ -65,5 +71,49 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) { } } } + + function updatePositionCounters() { + /* Keeping Position Counters Up-to-date */ + if ( + (tradingEngine.current.strategy.stageType.value === 'Open Stage' || tradingEngine.current.strategy.stageType.value === 'Manage Stage') + ) { + if (takePositionNow === true) { + tradingEngine.current.position.positionCounters.periods.value = 0 + } + + tradingEngine.current.position.positionCounters.periods.value++ + tradingEngine.current.position.positionStatistics.days.value = tradingEngine.current.position.positionCounters.periods.value * sessionParameters.timeFrame.config.value / ONE_DAY_IN_MILISECONDS + } else { + tradingEngine.current.position.positionCounters.periods.value = 0 + tradingEngine.current.position.positionStatistics.days.value = 0 + } + } + + function updateDistanceToEventsCounters() { + /* Keeping Distance Counters Up-to-date */ + if ( + tradingEngine.current.distanceToEvent.triggerOn.value > 0 // with this we avoind counting before the first event happens. + ) { + tradingEngine.current.distanceToEvent.triggerOn.value++ + } + + if ( + tradingEngine.current.distanceToEvent.triggerOff.value > 0 // with this we avoind counting before the first event happens. + ) { + tradingEngine.current.distanceToEvent.triggerOff.value++ + } + + if ( + tradingEngine.current.distanceToEvent.takePosition.value > 0 // with this we avoind counting before the first event happens. + ) { + tradingEngine.current.distanceToEvent.takePosition.value++ + } + + if ( + tradingEngine.current.distanceToEvent.closePosition.value > 0 // with this we avoind counting before the first event happens. + ) { + tradingEngine.current.distanceToEvent.closePosition.value++ + } + } } diff --git a/Trading/TradingSimulation.js b/Trading/TradingSimulation.js index f9d871183..609191d13 100644 --- a/Trading/TradingSimulation.js +++ b/Trading/TradingSimulation.js @@ -294,7 +294,7 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT const TRADING_SYSTEM_MODULE = require('./TradingSystem.js') let tradingSystemModule = TRADING_SYSTEM_MODULE.newTradingSystem(bot, logger) - tradingSystemModule.initialize(chart) + tradingSystemModule.initialize(chart, candle) tradingSystemModule.evalConditions() tradingSystemModule.evalFormulas() @@ -341,7 +341,7 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT tradingSystemModule.checkTriggerOn() tradingSystemModule.checkTriggerOff() - tradingSystemModule.checkTakePosition() + takePositionNow = tradingSystemModule.checkTakePosition() /* Stop Loss Management */ if ( @@ -361,154 +361,20 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT tradingSystemModule.calculateTakeProfit() } - tradingSystemModule.finalize() - /* Keeping Position Counters Up-to-date */ - if ( - (tradingEngine.current.strategy.stageType.value === 'Open Stage' || tradingEngine.current.strategy.stageType.value === 'Manage Stage') - ) { - if (takePositionNow === true) { - tradingEngine.current.position.positionCounters.periods.value = 0 - } - - tradingEngine.current.position.positionCounters.periods.value++ - tradingEngine.current.position.positionStatistics.days.value = tradingEngine.current.position.positionCounters.periods.value * sessionParameters.timeFrame.config.value / ONE_DAY_IN_MILISECONDS - } else { - tradingEngine.current.position.positionCounters.periods.value = 0 - tradingEngine.current.position.positionStatistics.days.value = 0 - } - - /* Keeping Distance Counters Up-to-date */ - if ( - tradingEngine.current.distanceToEvent.triggerOn.value > 0 // with this we avoind counting before the first event happens. - ) { - tradingEngine.current.distanceToEvent.triggerOn.value++ - } - - if ( - tradingEngine.current.distanceToEvent.triggerOff.value > 0 // with this we avoind counting before the first event happens. - ) { - tradingEngine.current.distanceToEvent.triggerOff.value++ - } - - if ( - tradingEngine.current.distanceToEvent.takePosition.value > 0 // with this we avoind counting before the first event happens. - ) { - tradingEngine.current.distanceToEvent.takePosition.value++ - } - - if ( - tradingEngine.current.distanceToEvent.closePosition.value > 0 // with this we avoind counting before the first event happens. - ) { - tradingEngine.current.distanceToEvent.closePosition.value++ - } + tradingEngineModule.updatePositionCounters() + tradingEngineModule.updateDistanceToEventsCounters() /* Checking if Stop or Take Profit were hit */ if ( (tradingEngine.current.strategy.stageType.value === 'Open Stage' || tradingEngine.current.strategy.stageType.value === 'Manage Stage') && takePositionNow !== true ) { - let strategy = tradingSystem.strategies[tradingEngine.current.strategy.index.value] - - /* Checking what happened since the last execution. We need to know if the Stop Loss - or our Take Profit were hit. */ - - /* Stop Loss condition: Here we verify if the Stop Loss was hitted or not. */ - - if ((sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset && candle.max >= tradingEngine.current.position.stopLoss.value) || (sessionParameters.sessionBaseAsset.name !== bot.market.marketBaseAsset && candle.min <= tradingEngine.current.position.stopLoss.value)) { - if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> loop -> Stop Loss was hit.') } - /* - Hit Point Validation - - This prevents misscalculations when a formula places the stop loss in this case way beyond the market price. - If we take the stop loss value at those situation would be a huge distortion of facts. - */ - - if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { - if (tradingEngine.current.position.stopLoss.value < candle.min) { - tradingEngine.current.position.stopLoss.value = candle.min - } - } else { - if (tradingEngine.current.position.stopLoss.value > candle.max) { - tradingEngine.current.position.stopLoss.value = candle.max - } - } - - let slippedStopLoss = tradingEngine.current.position.stopLoss.value - - /* Apply the Slippage */ - let slippageAmount = slippedStopLoss * bot.VALUES_TO_USE.slippage.stopLoss / 100 - - if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { - slippedStopLoss = slippedStopLoss + slippageAmount - } else { - slippedStopLoss = slippedStopLoss - slippageAmount - } - - closeRate = slippedStopLoss - - tradingEngine.current.strategy.stageType.value = 'Close Stage' - checkAnnouncements(strategy.closeStage, 'Stop') - - tradingEngine.current.position.stopLoss.stopLossStage.value = 'No Stage' - tradingEngine.current.position.takeProfit.takeProfitStage.value = 'No Stage' - tradingEngine.current.position.end.value = candle.end - tradingEngine.current.position.status.value = 1 - tradingEngine.current.position.exitType.value = 1 - tradingEngine.current.position.endRate.value = closeRate - - closePositionNow = true - } - - /* Take Profit condition: Here we verify if the Take Profit was hit or not. */ - - if ((sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset && candle.min <= tradingEngine.current.position.takeProfit.value) || (sessionParameters.sessionBaseAsset.name !== bot.market.marketBaseAsset && candle.max >= tradingEngine.current.position.takeProfit.value)) { - if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> loop -> Take Profit was hit.') } - /* - Hit Point Validation: - - This prevents misscalculations when a formula places the take profit in this case way beyond the market price. - If we take the stop loss value at those situation would be a huge distortion of facts. - */ - - if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { - if (tradingEngine.current.position.takeProfit.value > candle.max) { - tradingEngine.current.position.takeProfit.value = candle.max - } - } else { - if (tradingEngine.current.position.takeProfit.value < candle.min) { - tradingEngine.current.position.takeProfit.value = candle.min - } - } - - let slippedTakeProfit = tradingEngine.current.position.takeProfit.value - /* Apply the Slippage */ - let slippageAmount = slippedTakeProfit * bot.VALUES_TO_USE.slippage.takeProfit / 100 - - if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { - slippedTakeProfit = slippedTakeProfit + slippageAmount - } else { - slippedTakeProfit = slippedTakeProfit - slippageAmount - } - - closeRate = slippedTakeProfit - - tradingEngine.current.strategy.stageType.value = 'Close Stage' - checkAnnouncements(strategy.closeStage, 'Take Profit') - - tradingEngine.current.position.stopLoss.stopLossStage.value = 'No Stage' - tradingEngine.current.position.takeProfit.takeProfitStage.value = 'No Stage' - - tradingEngine.current.position.end.value = candle.end - tradingEngine.current.position.status.value = 1 - tradingEngine.current.position.exitType.value = 2 - tradingEngine.current.position.endRate.value = closeRate - - closePositionNow = true - addToSnapshots = true - } + closePositionNow = tradingSystemModule.checkStopLossOrTakeProfitWasHit() } + tradingSystemModule.finalize() + /* Taking a Position */ if ( takePositionNow === true @@ -520,10 +386,8 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT tradingEngine.current.distanceToEvent.takePosition.value = 1 /* Position size and rate */ - let strategy = tradingSystem.strategies[tradingEngine.current.strategy.index.value] - - tradingEngine.current.position.size.value = strategy.positionSize - tradingEngine.current.position.rate.value = strategy.positionRate + tradingEngine.current.position.size.value = getPositionSize() + tradingEngine.current.position.rate.value = getPositionRate() /* We take what was calculated at the formula and apply the slippage. */ let slippageAmount = tradingEngine.current.position.rate.value * bot.VALUES_TO_USE.slippage.positionRate / 100 @@ -536,8 +400,8 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT if (bot.startMode === 'Live') { logger.write(MODULE_NAME, '[PERSIST] runSimulation -> loop -> takePositionNow -> Taking a Position in Live Mode.') - logger.write(MODULE_NAME, '[PERSIST] runSimulation -> loop -> takePositionNow -> strategy.positionSize = ' + strategy.positionSize) - logger.write(MODULE_NAME, '[PERSIST] runSimulation -> loop -> takePositionNow -> strategy.positionRate = ' + strategy.positionRate) + logger.write(MODULE_NAME, '[PERSIST] runSimulation -> loop -> takePositionNow -> tradingEngine.current.position.size.value = ' + tradingEngine.current.position.size.value) + logger.write(MODULE_NAME, '[PERSIST] runSimulation -> loop -> takePositionNow -> tradingEngine.current.position.rate.value = ' + tradingEngine.current.position.rate.value) logger.write(MODULE_NAME, '[PERSIST] runSimulation -> loop -> takePositionNow -> slippageAmount = ' + slippageAmount) logger.write(MODULE_NAME, '[PERSIST] runSimulation -> loop -> takePositionNow -> tradingEngine.current.position.rate.value = ' + tradingEngine.current.position.rate.value) } @@ -897,20 +761,16 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT let feePaid = 0 if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { - strategy.positionSize = tradingEngine.current.balance.quotedAsset.value / closeRate - strategy.positionRate = closeRate - feePaid = tradingEngine.current.balance.quotedAsset.value / closeRate * bot.VALUES_TO_USE.feeStructure.taker / 100 + feePaid = tradingEngine.current.balance.quotedAsset.value / tradingEngine.current.position.endRate.value * bot.VALUES_TO_USE.feeStructure.taker / 100 - tradingEngine.current.balance.baseAsset.value = tradingEngine.current.balance.baseAsset.value + tradingEngine.current.balance.quotedAsset.value / closeRate - feePaid + tradingEngine.current.balance.baseAsset.value = tradingEngine.current.balance.baseAsset.value + tradingEngine.current.balance.quotedAsset.value / tradingEngine.current.position.endRate.value - feePaid tradingEngine.current.balance.quotedAsset.value = 0 } else { - strategy.positionSize = tradingEngine.current.balance.baseAsset.value * closeRate - strategy.positionRate = closeRate - feePaid = tradingEngine.current.balance.baseAsset.value * closeRate * bot.VALUES_TO_USE.feeStructure.taker / 100 + feePaid = tradingEngine.current.balance.baseAsset.value * tradingEngine.current.position.endRate.value * bot.VALUES_TO_USE.feeStructure.taker / 100 - tradingEngine.current.balance.quotedAsset.value = tradingEngine.current.balance.quotedAsset.value + tradingEngine.current.balance.baseAsset.value * closeRate - feePaid + tradingEngine.current.balance.quotedAsset.value = tradingEngine.current.balance.quotedAsset.value + tradingEngine.current.balance.baseAsset.value * tradingEngine.current.position.endRate.value - feePaid tradingEngine.current.balance.baseAsset.value = 0 } @@ -1370,10 +1230,7 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT function afterLoop() { if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> afterLoop -> Entering function.') } - /* - Before returning we need to see if we have to record some of our counters at the variable. - To do that, the condition to be met is that this execution must include all candles of the current day. - */ + tradingEngineModule.finalize() if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> callback -> recordsArray.length = ' + recordsArray.length) } diff --git a/Trading/TradingSystem.js b/Trading/TradingSystem.js index 1cc854c51..fa01e77e6 100644 --- a/Trading/TradingSystem.js +++ b/Trading/TradingSystem.js @@ -13,11 +13,15 @@ exports.newTradingSystem = function newTradingSystem(bot, logger) { calculateStopLoss: calculateStopLoss, checkTakeProfitPhases: checkTakeProfitPhases, calculateTakeProfit: calculateTakeProfit, + checkStopLossOrTakeProfitWasHit: checkStopLossOrTakeProfitWasHit, + getPositionSize: getPositionSize, + getPositionRate: getPositionRate, initialize: initialize, finalize: finalize } let chart + let candle let tradingSystem let tradingEngine @@ -31,14 +35,16 @@ exports.newTradingSystem = function newTradingSystem(bot, logger) { return thisObject - function initialize(pChart) { + function initialize(pChart, pCandle) { chart = pChart + candle = pCandle tradingSystem = bot.TRADING_SYSTEM tradingEngine = bot.TRADING_ENGINE } function finalize() { chart = undefined + candle = undefined tradingSystem = undefined tradingEngine = undefined @@ -347,19 +353,19 @@ exports.newTradingSystem = function newTradingSystem(bot, logger) { tradingEngine.current.position.stopLossPhase.value = 0 tradingEngine.current.position.takeProfitPhase.value = 0 - takePositionNow = true tradingEngine.current.position.situationName.value = situation.name checkAnnouncements(triggerStage.takePosition) saveAsLastTakePositionSnapshot = true if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> loop -> Conditions at the Take Position Event were met.') } - break + return true } } } } } + return false } function checkStopPhases() { @@ -511,7 +517,6 @@ exports.newTradingSystem = function newTradingSystem(bot, logger) { } } - function checkTakeProfitPhases() { let strategy = tradingSystem.strategies[tradingEngine.current.strategy.index.value] @@ -661,5 +666,148 @@ exports.newTradingSystem = function newTradingSystem(bot, logger) { } } } + + function checkStopLossOrTakeProfitWasHit() { + { + let strategy = tradingSystem.strategies[tradingEngine.current.strategy.index.value] + + /* Checking what happened since the last execution. We need to know if the Stop Loss + or our Take Profit were hit. */ + + /* Stop Loss condition: Here we verify if the Stop Loss was hitted or not. */ + + if ( + (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset && candle.max >= tradingEngine.current.position.stopLoss.value) || + (sessionParameters.sessionBaseAsset.name !== bot.market.marketBaseAsset && candle.min <= tradingEngine.current.position.stopLoss.value) + ) { + if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> loop -> Stop Loss was hit.') } + /* + Hit Point Validation + + This prevents misscalculations when a formula places the stop loss in this case way beyond the market price. + If we take the stop loss value at those situation would be a huge distortion of facts. + */ + + if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { + if (tradingEngine.current.position.stopLoss.value < candle.min) { + tradingEngine.current.position.stopLoss.value = candle.min + } + } else { + if (tradingEngine.current.position.stopLoss.value > candle.max) { + tradingEngine.current.position.stopLoss.value = candle.max + } + } + + let slippedStopLoss = tradingEngine.current.position.stopLoss.value + + /* Apply the Slippage */ + let slippageAmount = slippedStopLoss * bot.VALUES_TO_USE.slippage.stopLoss / 100 + + if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { + slippedStopLoss = slippedStopLoss + slippageAmount + } else { + slippedStopLoss = slippedStopLoss - slippageAmount + } + + tradingEngine.current.position.endRate.value = slippedStopLoss + + tradingEngine.current.strategy.stageType.value = 'Close Stage' + checkAnnouncements(strategy.closeStage, 'Stop') + + tradingEngine.current.position.stopLoss.stopLossStage.value = 'No Stage' + tradingEngine.current.position.takeProfit.takeProfitStage.value = 'No Stage' + tradingEngine.current.position.end.value = candle.end + tradingEngine.current.position.status.value = 1 + tradingEngine.current.position.exitType.value = 1 + + return true + } + + /* Take Profit condition: Here we verify if the Take Profit was hit or not. */ + + if ( + (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset && candle.min <= tradingEngine.current.position.takeProfit.value) || + (sessionParameters.sessionBaseAsset.name !== bot.market.marketBaseAsset && candle.max >= tradingEngine.current.position.takeProfit.value) + ) { + if (FULL_LOG === true) { logger.write(MODULE_NAME, '[INFO] runSimulation -> loop -> Take Profit was hit.') } + /* + Hit Point Validation: + + This prevents misscalculations when a formula places the take profit in this case way beyond the market price. + If we take the stop loss value at those situation would be a huge distortion of facts. + */ + + if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { + if (tradingEngine.current.position.takeProfit.value > candle.max) { + tradingEngine.current.position.takeProfit.value = candle.max + } + } else { + if (tradingEngine.current.position.takeProfit.value < candle.min) { + tradingEngine.current.position.takeProfit.value = candle.min + } + } + + let slippedTakeProfit = tradingEngine.current.position.takeProfit.value + /* Apply the Slippage */ + let slippageAmount = slippedTakeProfit * bot.VALUES_TO_USE.slippage.takeProfit / 100 + + if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { + slippedTakeProfit = slippedTakeProfit + slippageAmount + } else { + slippedTakeProfit = slippedTakeProfit - slippageAmount + } + + tradingEngine.current.position.endRate.value = slippedTakeProfit + + tradingEngine.current.strategy.stageType.value = 'Close Stage' + checkAnnouncements(strategy.closeStage, 'Take Profit') + + tradingEngine.current.position.stopLoss.stopLossStage.value = 'No Stage' + tradingEngine.current.position.takeProfit.takeProfitStage.value = 'No Stage' + + tradingEngine.current.position.end.value = candle.end + tradingEngine.current.position.status.value = 1 + tradingEngine.current.position.exitType.value = 2 + + addToSnapshots = true + return true + } + } + return false + } + + function getPositionSize() { + let balance + if (sessionParameters.sessionBaseAsset.name === bot.market.marketBaseAsset) { + balance = tradingEngine.current.balance.baseAsset.value + } else { + balance = tradingEngine.current.balance.quotedAsset.value + } + const DEFAULT_VALUE = balance + let strategy = tradingSystem.strategies[tradingEngine.current.strategy.index.value] + + if (strategy.openStage === undefined) return { DEFAULT_VALUE } + if (strategy.openStage.initialDefinition === undefined) return { DEFAULT_VALUE } + if (strategy.openStage.initialDefinition.positionSize === undefined) return { DEFAULT_VALUE } + if (strategy.openStage.initialDefinition.positionSize.formula === undefined) return { DEFAULT_VALUE } + + let value = formulas.get(strategy.openStage.initialDefinition.positionSize.formula.id) + if (value === undefined) return { DEFAULT_VALUE } + return value + } + + function getPositionRate() { + const DEFAULT_VALUE = candle.close + let strategy = tradingSystem.strategies[tradingEngine.current.strategy.index.value] + + if (strategy.openStage === undefined) return { DEFAULT_VALUE } + if (strategy.openStage.initialDefinition === undefined) return { DEFAULT_VALUE } + if (strategy.openStage.initialDefinition.positionRate === undefined) return { DEFAULT_VALUE } + if (strategy.openStage.initialDefinition.positionRate.formula === undefined) return { DEFAULT_VALUE } + + let value = formulas.get(strategy.openStage.initialDefinition.positionRate.formula.id) + if (value === undefined) return { DEFAULT_VALUE } + return value + } }