removed cross references at tradingEngine

This commit is contained in:
Luis Fernando Molina committed 2020-08-09 09:47:27 +02:00
1 parent a297a366a6
commit a44c92954a
7 files changed
+16 -11

No files matched your search

+1 -1
View File
@@ -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)
+2 -2
View File
@@ -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() {
+7 -2
View File
@@ -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.
+1 -1
View File
@@ -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)
}
}
+2 -2
View File
@@ -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')
}
}
+2 -2
View File
@@ -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)
}
}
+1 -1
View File
@@ -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)
}
}