diff --git a/LowFrequencyTrading/TradingEngine.js b/LowFrequencyTrading/TradingEngine.js index 3c3255225..292b58dfc 100644 --- a/LowFrequencyTrading/TradingEngine.js +++ b/LowFrequencyTrading/TradingEngine.js @@ -9,6 +9,7 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) { getNodeById: getNodeById, cloneValues: cloneValues, setCurrentCandle: setCurrentCandle, + initializeNode: initializeNode, initialize: initialize, finalize: finalize } @@ -108,7 +109,6 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) { node.value = node.config.initialValue } } - node.initialize = initializeNode // This will allow anyone to initialize this node and its children. /* Now we go down through all this node children */ let nodeDefinition = bot.APP_SCHEMA_MAP.get(node.type) diff --git a/LowFrequencyTrading/TradingEpisode.js b/LowFrequencyTrading/TradingEpisode.js index 5dc450d8c..a3207a285 100644 --- a/LowFrequencyTrading/TradingEpisode.js +++ b/LowFrequencyTrading/TradingEpisode.js @@ -1,4 +1,4 @@ -exports.newTradingEpisode = function newTradingEpisode(bot, logger) { +exports.newTradingEpisode = function newTradingEpisode(bot, logger, tradingEngineModule) { /* This module packages all functions related to Episodes. */ @@ -76,7 +76,7 @@ exports.newTradingEpisode = function newTradingEpisode(bot, logger) { } function resetEpisode() { - tradingEngine.current.episode.initialize(tradingEngine.current.episode) + tradingEngineModule.initializeNode(tradingEngine.current.episode) } function updateEnds() { diff --git a/LowFrequencyTrading/TradingOrders.js b/LowFrequencyTrading/TradingOrders.js index 04bf46db3..609f7d987 100644 --- a/LowFrequencyTrading/TradingOrders.js +++ b/LowFrequencyTrading/TradingOrders.js @@ -78,7 +78,12 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM let tradingSystemOrder = orders[i] if (tradingSystemOrder.referenceParent === undefined) { continue } let tradingEngineOrder = tradingEngineModule.getNodeById(tradingSystemOrder.referenceParent.id) - if (tradingEngineOrder.status === undefined) { continue } + try { + if (tradingEngineOrder.status === undefined) { continue } + } catch (err) { + + } + updateCounters(tradingEngineOrder) updateEnds(tradingEngineOrder) @@ -873,7 +878,7 @@ exports.newTradingOrders = function newTradingOrders(bot, logger, tradingEngineM function resetTradingEngineDataStructure(tradingEngineOrder, tradingSystemOrder, stageStatus) { if (tradingEngineOrder.status.value === 'Closed') { /* We reset the order data structure inside the Trading Engine to its initial value */ - tradingEngineOrder.initialize(tradingEngineOrder) + tradingEngineModule.initializeNode(tradingEngineOrder) if (tradingSystemOrder.config.spawnMultipleOrders !== true) { /* We close the lock so as to prevent this data structure to be used again during this same stage execution. diff --git a/LowFrequencyTrading/TradingPosition.js b/LowFrequencyTrading/TradingPosition.js index 2666b1b80..a9d621fd3 100644 --- a/LowFrequencyTrading/TradingPosition.js +++ b/LowFrequencyTrading/TradingPosition.js @@ -238,7 +238,7 @@ exports.newTradingPosition = function newTradingPosition(bot, logger, tradingEng function resetTradingEngineDataStructure() { if (tradingEngine.current.position.status.value === 'Closed') { - tradingEngine.current.position.initialize(tradingEngine.current.position) + tradingEngine.initializeNode(tradingEngine.current.position) } } diff --git a/LowFrequencyTrading/TradingSimulation.js b/LowFrequencyTrading/TradingSimulation.js index 970ddecc7..acd5d239d 100644 --- a/LowFrequencyTrading/TradingSimulation.js +++ b/LowFrequencyTrading/TradingSimulation.js @@ -47,7 +47,7 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT tradingSystemModule.initialize() const TRADING_EPISODE_MODULE = require('./TradingEpisode.js') - let tradingEpisodeModule = TRADING_EPISODE_MODULE.newTradingEpisode(bot, logger) + let tradingEpisodeModule = TRADING_EPISODE_MODULE.newTradingEpisode(bot, logger, tradingEngineModule) tradingEpisodeModule.initialize() /* Setting up the candles array: The whole simulation is based on the array of candles at the time-frame defined at the session parameters. */ @@ -177,7 +177,7 @@ exports.newTradingSimulation = function newTradingSimulation(bot, logger, UTILIT setImmediate(loop) // This will execute the next loop in the next iteration of the NodeJs event loop allowing for other callbacks to be executed. } else { - closeEpisode('All Candles Processed') + updateEpisode('All Candles Processed') } } diff --git a/LowFrequencyTrading/TradingStages.js b/LowFrequencyTrading/TradingStages.js index 8a64ac788..1f19fd31b 100644 --- a/LowFrequencyTrading/TradingStages.js +++ b/LowFrequencyTrading/TradingStages.js @@ -269,7 +269,7 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM let executionNode = stageNode.openExecution /* Reset the Exchange Orders data structure to its initial value */ - tradingEngine.exchangeOrders.initialize(tradingEngine.exchangeOrders) + tradingEngineModule.initializeNode(tradingEngine.exchangeOrders) tradingSystem.evalConditions(stageNode, 'Initial Definition') tradingSystem.evalFormulas(stageNode, 'Initial Definition') @@ -1066,7 +1066,7 @@ exports.newTradingStages = function newTradingStages(bot, logger, tradingEngineM } function resetStage(stage) { - stage.initialize(stage) + tradingEngineModule.initializeNode(stage) } } diff --git a/LowFrequencyTrading/TradingStrategy.js b/LowFrequencyTrading/TradingStrategy.js index c3ec62c47..87216fc29 100644 --- a/LowFrequencyTrading/TradingStrategy.js +++ b/LowFrequencyTrading/TradingStrategy.js @@ -65,7 +65,7 @@ exports.newTradingStrategy = function newTradingStrategy(bot, logger, tradingEng function resetTradingEngineDataStructure() { if (tradingEngine.current.strategy.status.value === 'Closed') { - tradingEngine.current.strategy.initialize(tradingEngine.current.strategy) + tradingEngineModule.initializeNode(tradingEngine.current.strategy) } }