From 784a2aaec4bff99f5723932980cee48f7f72c659 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Sat, 28 Nov 2020 11:21:41 +0100 Subject: [PATCH] global.APP_SCHEMA_MAP --- Projects/Superalgos/TS/Globals/TaskConstants.js | 3 ++- Projects/Superalgos/TS/Utilities/NodeFunctions.js | 6 +++--- TaskServer/LowFrequencyTrading/Snapshots.js | 2 +- TaskServer/LowFrequencyTrading/TradingEngine.js | 6 +++--- TaskServer/LowFrequencyTrading/TradingSystem.js | 2 +- TaskServer/ReinforcementLearning/MarkovDecisionProcess.js | 6 +++--- TaskServer/Task.js | 4 +++- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Projects/Superalgos/TS/Globals/TaskConstants.js b/Projects/Superalgos/TS/Globals/TaskConstants.js index 609d684b1..85625e199 100644 --- a/Projects/Superalgos/TS/Globals/TaskConstants.js +++ b/Projects/Superalgos/TS/Globals/TaskConstants.js @@ -6,7 +6,8 @@ exports.newSuperalgosGlobalsTaskConstants = function () { let thisObject = { TASK_NODE: undefined, NETWORK_NODE: undefined, - PROJECTS_SCHEMA: undefined + PROJECTS_SCHEMA: undefined, + APP_SCHEMA_MAP: undefined } return thisObject diff --git a/Projects/Superalgos/TS/Utilities/NodeFunctions.js b/Projects/Superalgos/TS/Utilities/NodeFunctions.js index be3c0c014..c8fafbfca 100644 --- a/Projects/Superalgos/TS/Utilities/NodeFunctions.js +++ b/Projects/Superalgos/TS/Utilities/NodeFunctions.js @@ -16,7 +16,7 @@ exports.newSuperalgosUtilitiesNodeFunctions = function () { return resultArray function scanNodeBranch(startingNode) { - let nodeDefinition = global.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type) if (nodeDefinition === undefined) { return } if (startingNode.type === nodeType) { @@ -60,7 +60,7 @@ exports.newSuperalgosUtilitiesNodeFunctions = function () { if (startingNode === undefined) { return } if (nodeFound !== undefined) { return } - let nodeDefinition = global.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type) if (nodeDefinition === undefined) { return } if (startingNode.type === nodeType) { @@ -114,7 +114,7 @@ exports.newSuperalgosUtilitiesNodeFunctions = function () { function scanNodeMesh(startingNode) { if (startingNode === undefined) { return } - let nodeDefinition = global.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(startingNode.project + '-' + startingNode.type) if (nodeDefinition === undefined) { return } if (startingNode.id === nodeId) { diff --git a/TaskServer/LowFrequencyTrading/Snapshots.js b/TaskServer/LowFrequencyTrading/Snapshots.js index 9fbc4cd88..e90865053 100644 --- a/TaskServer/LowFrequencyTrading/Snapshots.js +++ b/TaskServer/LowFrequencyTrading/Snapshots.js @@ -124,7 +124,7 @@ exports.newSnapshots = function newSnapshots(bot, logger) { } /* Now we go down through all this node children */ - let nodeDefinition = global.APP_SCHEMA_MAP.get(node.project + '-' + node.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(node.project + '-' + node.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { diff --git a/TaskServer/LowFrequencyTrading/TradingEngine.js b/TaskServer/LowFrequencyTrading/TradingEngine.js index d3abbe90d..f61a0a505 100644 --- a/TaskServer/LowFrequencyTrading/TradingEngine.js +++ b/TaskServer/LowFrequencyTrading/TradingEngine.js @@ -112,7 +112,7 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) { destinationNode.value = originNode.value /* Now we go down through all the children of the origin node, assuming the destination node has the same children structure*/ - let nodeDefinition = global.APP_SCHEMA_MAP.get(originNode.project + '-' + originNode.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(originNode.project + '-' + originNode.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { @@ -151,7 +151,7 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) { nodesMap.set(node.id, node) /* Now we go down through all this node children */ - let nodeDefinition = global.APP_SCHEMA_MAP.get(node.project + '-' + node.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(node.project + '-' + node.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { @@ -194,7 +194,7 @@ exports.newTradingEngine = function newTradingEngine(bot, logger) { } /* Now we go down through all this node children */ - let nodeDefinition = global.APP_SCHEMA_MAP.get(node.project + '-' + node.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(node.project + '-' + node.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { diff --git a/TaskServer/LowFrequencyTrading/TradingSystem.js b/TaskServer/LowFrequencyTrading/TradingSystem.js index 6ea00422d..3c0890d86 100644 --- a/TaskServer/LowFrequencyTrading/TradingSystem.js +++ b/TaskServer/LowFrequencyTrading/TradingSystem.js @@ -201,7 +201,7 @@ exports.newTradingSystem = function newTradingSystem(bot, logger, tradingEngineM } /* Now we go down through all this node children */ - let nodeDefinition = global.APP_SCHEMA_MAP.get(node.project + '-' + node.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(node.project + '-' + node.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { diff --git a/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js b/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js index 1ff9258a6..c39128afd 100644 --- a/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js +++ b/TaskServer/ReinforcementLearning/MarkovDecisionProcess.js @@ -101,7 +101,7 @@ exports.newMarkovDecisionProcess = function newMarkovDecisionProcess(bot, logger destinationNode.value = originNode.value /* Now we go down through all the children of the origin node, assuming the destination node has the same children structure*/ - let nodeDefinition = global.APP_SCHEMA_MAP.get(originNode.project + '-' + originNode.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(originNode.project + '-' + originNode.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { @@ -140,7 +140,7 @@ exports.newMarkovDecisionProcess = function newMarkovDecisionProcess(bot, logger nodesMap.set(node.id, node) /* Now we go down through all this node children */ - let nodeDefinition = global.APP_SCHEMA_MAP.get(node.project + '-' + node.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(node.project + '-' + node.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { @@ -183,7 +183,7 @@ exports.newMarkovDecisionProcess = function newMarkovDecisionProcess(bot, logger } /* Now we go down through all this node children */ - let nodeDefinition = global.APP_SCHEMA_MAP.get(node.project + '-' + node.type) + let nodeDefinition = TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP.get(node.project + '-' + node.type) if (nodeDefinition === undefined) { return } if (nodeDefinition.properties !== undefined) { diff --git a/TaskServer/Task.js b/TaskServer/Task.js index 63151891e..fc34d9378 100644 --- a/TaskServer/Task.js +++ b/TaskServer/Task.js @@ -101,7 +101,9 @@ function bootingProcess() { TS.projects.superalgos.globals.taskConstants.NETWORK_NODE = global.NETWORK_NODE NETWORK_NODE = undefined TS.projects.superalgos.globals.taskConstants.PROJECTS_SCHEMA = global.PROJECTS_SCHEMA - global.PROJECTS_SCHEMA = undefined + global.PROJECTS_SCHEMA = undefined + TS.projects.superalgos.globals.taskConstants.APP_SCHEMA_MAP = global.APP_SCHEMA_MAP + global.APP_SCHEMA_MAP = undefined } function setupTaskHeartbeats() {