From ac8afa23e12e76d5e28c7f1906f6cd9422870501 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 19 Oct 2020 18:30:48 +0200 Subject: [PATCH] Branches --- .../ChartingSpaceFunctions.js | 18 +++++++------- .../CryptoEcosystemFunctions.js | 24 +++++++++---------- .../DataStorageFunctions.js | 8 +++---- .../Spaces/Panel-Space/LayersPanel.js | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js b/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js index d549a98da..506cdf59e 100644 --- a/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js +++ b/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js @@ -52,7 +52,7 @@ function newChartingSpaceFunctions() { that do not have a plotter module. Since our previous action created all layers no matter what, we need now to delete all the ones that do not have a plotter module. */ - let allLayers = nodeBranchToArray(botLayers, 'Layer') + let allLayers = UI.projects.superalgos.utilities.branches.nodeBranchToArray(botLayers, 'Layer') for (let j = 0; j < allLayers.length; j++) { let layer = allLayers[j] layer.payload.floatingObject.angleToParent = ANGLE_TO_PARENT.RANGE_45 @@ -83,10 +83,10 @@ function newChartingSpaceFunctions() { function scanNetworkNode(networkNode) { if (networkNode === undefined) { return } - let backtestingSessionsArray = nodeBranchToArray(networkNode, 'Backtesting Session') - let fordwardTestingSessionsArray = nodeBranchToArray(networkNode, 'Forward Testing Session') - let paperTradingSessionsArray = nodeBranchToArray(networkNode, 'Paper Trading Session') - let liveTradingSessionsArray = nodeBranchToArray(networkNode, 'Live Trading Session') + let backtestingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Backtesting Session') + let fordwardTestingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Forward Testing Session') + let paperTradingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Paper Trading Session') + let liveTradingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Live Trading Session') scanSessionArray(backtestingSessionsArray) scanSessionArray(fordwardTestingSessionsArray) @@ -122,7 +122,7 @@ function newChartingSpaceFunctions() { /* We need to create a Timeline Chart for each Data Mine Indicators. */ - mineProducts = nodeBranchToArray(networkNode, 'Data Mine Products') + mineProducts = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Data Mine Products') for (let j = 0; j < mineProducts.length; j++) { let mineProduct = mineProducts[j] /* @@ -151,7 +151,7 @@ function newChartingSpaceFunctions() { menu.internalClick('Add All Mine Layers') } - mineProducts = nodeBranchToArray(networkNode, 'Trading Mine Products') + mineProducts = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Trading Mine Products') for (let j = 0; j < mineProducts.length; j++) { let mineProduct = mineProducts[j] /* @@ -227,8 +227,8 @@ function newChartingSpaceFunctions() { } function scanNetworkNode(networkNode) { - let testingEnvironment = findInBranch(networkNode, 'Testing Environment', node, true) - let productionEnvironment = findInBranch(networkNode, 'Production Environment', node, true) + let testingEnvironment = UI.projects.superalgos.utilities.branches.findInBranch(networkNode, 'Testing Environment', node, true) + let productionEnvironment = UI.projects.superalgos.utilities.branches.findInBranch(networkNode, 'Production Environment', node, true) if (isMissingChildren(node, testingEnvironment, true) === true) { let dashboard = functionLibraryUiObjectsFromNodes.addUIObject(node, 'Dashboard') diff --git a/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js b/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js index c664577ee..bbcb8e462 100644 --- a/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js +++ b/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js @@ -241,7 +241,7 @@ function newCryptoEcosystemFunctions() { /* Here we complete the missing stuff at Data Mining */ - let dataMining = findInBranch(networkNode, 'Data Mining', node, true) + let dataMining = UI.projects.superalgos.utilities.branches.findInBranch(networkNode, 'Data Mining', node, true) if (dataMining === undefined) { node.payload.uiObject.setErrorMessage('Data Mining node not found at Network Node ' + networkNode.name) return @@ -268,7 +268,7 @@ function newCryptoEcosystemFunctions() { /* Now we install the environmnet at the current Network Node */ - let environmentFound = findInBranch(networkNode, environment, node, true) + let environmentFound = UI.projects.superalgos.utilities.branches.findInBranch(networkNode, environment, node, true) if (environmentFound === undefined) { node.payload.uiObject.setErrorMessage(environment + ' node not found at Network Node ' + networkNode.name) return @@ -282,8 +282,8 @@ function newCryptoEcosystemFunctions() { menuClickOfNodeArray(marketTradingTask.tradingMineTasks, 'Add All Tasks', true) /* This will be needed at the charging space, for creating Dashboards */ - let backtestingSessionsArray = nodeBranchToArray(marketTradingTask, 'Backtesting Session') - let liveTradingSessionsArray = nodeBranchToArray(marketTradingTask, 'Live Trading Session') + let backtestingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(marketTradingTask, 'Backtesting Session') + let liveTradingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(marketTradingTask, 'Live Trading Session') let allSessionsArray = backtestingSessionsArray.concat(liveTradingSessionsArray) sessionsCreatedArray = sessionsCreatedArray.concat(allSessionsArray) @@ -292,7 +292,7 @@ function newCryptoEcosystemFunctions() { /* Here we complete the missing stuff at Data Mines Data */ - let dataMinesData = findInBranch(networkNode, 'Data Mines Data', node, true) + let dataMinesData = UI.projects.superalgos.utilities.branches.findInBranch(networkNode, 'Data Mines Data', node, true) if (dataMinesData === undefined) { node.payload.uiObject.setErrorMessage('Data Mines Data node not found at Network Node ' + networkNode.name) return @@ -308,7 +308,7 @@ function newCryptoEcosystemFunctions() { /* Finally we complete the missing stuff at Trading Mines Data */ - let tradingMinesData = findInBranch(networkNode, 'Trading Mines Data', node, true) + let tradingMinesData = UI.projects.superalgos.utilities.branches.findInBranch(networkNode, 'Trading Mines Data', node, true) if (tradingMinesData === undefined) { node.payload.uiObject.setErrorMessage('Trading Mines Data node not found at Network Node ' + networkNode.name) return @@ -401,7 +401,7 @@ function newCryptoEcosystemFunctions() { function uninstallInChartingSpace(chartingSpace) { /* Delete all time machines which are referencing sessions inside the market being unistalled. */ - let timeMachines = nodeBranchToArray(chartingSpace, 'Time Machine') + let timeMachines = UI.projects.superalgos.utilities.branches.nodeBranchToArray(chartingSpace, 'Time Machine') for (let i = 0; i < timeMachines.length; i++) { let timeMachine = timeMachines[i] let session = timeMachine.payload.referenceParent @@ -416,7 +416,7 @@ function newCryptoEcosystemFunctions() { } /* Delete all Dashboards that does not have time machines inside. */ - let dashboardArray = nodeBranchToArray(chartingSpace, 'Dashboard') + let dashboardArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(chartingSpace, 'Dashboard') for (let i = 0; i < dashboardArray.length; i++) { let dashboard = dashboardArray[i] if (dashboard.timeMachines.length === 0) { @@ -435,10 +435,10 @@ function newCryptoEcosystemFunctions() { function uninstallInNetwork(network) { - let marketDataTasksArray = nodeBranchToArray(network, 'Market Data Tasks') - let marketTradingTasksArray = nodeBranchToArray(network, 'Market Trading Tasks') - let marketDataProductsArray = nodeBranchToArray(network, 'Market Data Products') - let marketTradingProductsArray = nodeBranchToArray(network, 'Market Trading Products') + let marketDataTasksArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(network, 'Market Data Tasks') + let marketTradingTasksArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(network, 'Market Trading Tasks') + let marketDataProductsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(network, 'Market Data Products') + let marketTradingProductsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(network, 'Market Trading Products') uninstalMarketArray(marketDataTasksArray) uninstalMarketArray(marketTradingTasksArray) diff --git a/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js b/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js index 3eb4e3822..b092b504d 100644 --- a/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js +++ b/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js @@ -88,10 +88,10 @@ function newDataStorageFunctions() { let networkNode = findNodeInNodeMesh(node, 'Network Node', undefined, true, false, true, false) if (networkNode === undefined) { return } - let backtestingSessionsArray = nodeBranchToArray(networkNode, 'Backtesting Session') - let fordwardTestingSessionsArray = nodeBranchToArray(networkNode, 'Forward Testing Session') - let paperTradingSessionsArray = nodeBranchToArray(networkNode, 'Paper Trading Session') - let liveTradingSessionsArray = nodeBranchToArray(networkNode, 'Live Trading Session') + let backtestingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Backtesting Session') + let fordwardTestingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Forward Testing Session') + let paperTradingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Paper Trading Session') + let liveTradingSessionsArray = UI.projects.superalgos.utilities.branches.nodeBranchToArray(networkNode, 'Live Trading Session') addMissingSession(backtestingSessionsArray) addMissingSession(fordwardTestingSessionsArray) diff --git a/Projects/Superalgos/Spaces/Panel-Space/LayersPanel.js b/Projects/Superalgos/Spaces/Panel-Space/LayersPanel.js index 62a9533c7..b7f341c89 100644 --- a/Projects/Superalgos/Spaces/Panel-Space/LayersPanel.js +++ b/Projects/Superalgos/Spaces/Panel-Space/LayersPanel.js @@ -375,7 +375,7 @@ function newLayersPanel() { function syncWithDesignerLayers() { if (thisObject.payload.node === undefined) { return } let layerManager = thisObject.payload.node - let layers = nodeBranchToArray(layerManager, 'Layer') + let layers = UI.projects.superalgos.utilities.branches.nodeBranchToArray(layerManager, 'Layer') for (let p = 0; p < layers.length; p++) { let layerNode = layers[p]