From ae076709eb5a67cb397078ef1ca858d9b3fc2228 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 4 Nov 2020 18:05:59 +0100 Subject: [PATCH] Bug Fixes --- Projects/Superalgos/Function-Libraries/ActionSwitch.js | 5 ----- .../Function-Libraries/ChartingSpaceFunctions.js | 8 ++++---- .../Function-Libraries/CryptoEcosystemFunctions.js | 2 +- .../Superalgos/Function-Libraries/DataStorageFunctions.js | 1 + Projects/Superalgos/Function-Libraries/MineFunctions.js | 1 + Projects/Superalgos/Function-Libraries/TaskFunctions.js | 7 ++++--- Projects/Superalgos/Spaces/Floating-Space/UiObject.js | 1 + 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Projects/Superalgos/Function-Libraries/ActionSwitch.js b/Projects/Superalgos/Function-Libraries/ActionSwitch.js index 5e57b5fb6..3d822a641 100644 --- a/Projects/Superalgos/Function-Libraries/ActionSwitch.js +++ b/Projects/Superalgos/Function-Libraries/ActionSwitch.js @@ -342,11 +342,6 @@ function newSuperalgosActionSwitch() { functionLibraryTaskFunctions.addMissingDataMineTasks(action.node, action.rootNodes, functionLibraryUiObjectsFromNodes) } break - case 'Add Missing Learning Mine Tasks': - { - functionLibraryTaskFunctions.addMissingLearningMineTasks(action.node, action.rootNodes, functionLibraryUiObjectsFromNodes) - } - break case 'Add Missing Exchange Trading Tasks': { functionLibraryTaskFunctions.addMissingExchangeTradingTasks(action.node, action.rootNodes, functionLibraryUiObjectsFromNodes) diff --git a/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js b/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js index 0aa7c4a7f..3dd405c61 100644 --- a/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js +++ b/Projects/Superalgos/Function-Libraries/ChartingSpaceFunctions.js @@ -201,7 +201,7 @@ function newChartingSpaceFunctions() { sets its own name, which we are going to reuse here. */ mineProduct.payload.uiObject.invisiblePhysics() - timelineChart.name = mineProduct.name + timelineChart.name = mineProduct.name + ' Data' timelineChart.layerManager.payload.referenceParent = mineProduct timelineChart.payload.floatingObject.collapseToggle() timelineChart.layerManager.payload.floatingObject.collapseToggle() @@ -222,8 +222,8 @@ function newChartingSpaceFunctions() { We need to filter out the ones that do not belong to the market where the session is running at. */ - if (mineProduct.payload.parentNode.payload.referenceParent === undefined) { continue } - if (mineProduct.payload.parentNode.payload.referenceParent.id !== market.id) { continue } + if (mineProduct.payload.parentNode.payload.parentNode.payload.referenceParent === undefined) { continue } + if (mineProduct.payload.parentNode.payload.parentNode.payload.referenceParent.id !== market.id) { continue } let timelineChart = functionLibraryUiObjectsFromNodes.addUIObject(timeMachine, 'Timeline Chart') /* @@ -232,7 +232,7 @@ function newChartingSpaceFunctions() { sets its own name, which we are going to reuse here. */ mineProduct.payload.uiObject.invisiblePhysics() - timelineChart.name = mineProduct.name + timelineChart.name = mineProduct.name + ' Learning' timelineChart.layerManager.payload.referenceParent = mineProduct timelineChart.payload.floatingObject.collapseToggle() timelineChart.layerManager.payload.floatingObject.collapseToggle() diff --git a/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js b/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js index 33f78d3a9..c65fd5b26 100644 --- a/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js +++ b/Projects/Superalgos/Function-Libraries/CryptoEcosystemFunctions.js @@ -384,7 +384,7 @@ function newCryptoEcosystemFunctions() { for (let i = 0; i < learningSessionsCreatedArray.length; i++) { let session = learningSessionsCreatedArray[i] if (UI.projects.superalgos.utilities.children.isMissingChildren(marketLearningProducts, session, true) === true) { - functionLibraryDataStorageFunctions.createSessionReference(marketLearningProducts, session, 'Trading Session Reference', functionLibraryUiObjectsFromNodes) + functionLibraryDataStorageFunctions.createSessionReference(marketLearningProducts, session, 'Learning Session Reference', functionLibraryUiObjectsFromNodes) } } /* diff --git a/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js b/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js index 38ce00644..e75a2055c 100644 --- a/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js +++ b/Projects/Superalgos/Function-Libraries/DataStorageFunctions.js @@ -39,6 +39,7 @@ function newDataStorageFunctions() { scanBotArray(mine.sensorBots) scanBotArray(mine.indicatorBots) scanBotArray(mine.tradingBots) + scanBotArray(mine.learningBots) function scanBotArray(botArray) { if (botArray === undefined) { return } diff --git a/Projects/Superalgos/Function-Libraries/MineFunctions.js b/Projects/Superalgos/Function-Libraries/MineFunctions.js index 5abed0d41..1f8d55c6a 100644 --- a/Projects/Superalgos/Function-Libraries/MineFunctions.js +++ b/Projects/Superalgos/Function-Libraries/MineFunctions.js @@ -68,6 +68,7 @@ function newMineFunctions() { scanBotArray(dataMine.sensorBots) scanBotArray(dataMine.indicatorBots) scanBotArray(dataMine.tradingBots) + scanBotArray(dataMine.learningBots) function scanBotArray(botArray) { for (let i = 0; i < botArray.length; i++) { diff --git a/Projects/Superalgos/Function-Libraries/TaskFunctions.js b/Projects/Superalgos/Function-Libraries/TaskFunctions.js index 54c3f37aa..589990c02 100644 --- a/Projects/Superalgos/Function-Libraries/TaskFunctions.js +++ b/Projects/Superalgos/Function-Libraries/TaskFunctions.js @@ -562,11 +562,11 @@ function newTaskFunctions() { for (let i = 0; i < rootNodes.length; i++) { let rootNode = rootNodes[i] if (rootNode.type === rootNodeType) { - let dataMine = rootNode + let mine = rootNode - if (UI.projects.superalgos.utilities.children.isMissingChildren(node, dataMine, true) === true) { + if (UI.projects.superalgos.utilities.children.isMissingChildren(node, mine, true) === true) { let dataMineTasks = functionLibraryUiObjectsFromNodes.addUIObject(node, newNodeType) - dataMineTasks.payload.referenceParent = dataMine + dataMineTasks.payload.referenceParent = mine } } } @@ -618,6 +618,7 @@ function newTaskFunctions() { addTasksForBotArray(mine.sensorBots) addTasksForBotArray(mine.indicatorBots) addTasksForBotArray(mine.tradingBots) + addTasksForBotArray(mine.learningBots) function addTasksForBotArray(botsArray) { if (botsArray === undefined) { return } diff --git a/Projects/Superalgos/Spaces/Floating-Space/UiObject.js b/Projects/Superalgos/Spaces/Floating-Space/UiObject.js index b1e2eb6e3..c05002256 100644 --- a/Projects/Superalgos/Spaces/Floating-Space/UiObject.js +++ b/Projects/Superalgos/Spaces/Floating-Space/UiObject.js @@ -1381,6 +1381,7 @@ function newUiObject() { function drawChainLine() { if (UI.projects.superalgos.spaces.floatingSpace.drawChainLines === false) { return } if (thisObject.payload.chainParent === undefined) { return } + if (thisObject.payload.chainParent.payload === undefined) {return} let targetPoint = { x: thisObject.payload.chainParent.payload.floatingObject.container.frame.position.x,