From a858e01e5db5c65144b19fdc3732dac8128b1c9e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 6 Jun 2019 14:51:43 +0200 Subject: [PATCH] All working --- .../Workspace/FunctionLibraries/PartsFromNodes.js | 8 +++++++- .../Workspace/FunctionLibraries/WorkspaceNode.js | 2 ++ StrategySpace/Workspace/Workspace.js | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js index 33e9ee2b4..505f2e87c 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -166,6 +166,9 @@ function newPartsFromNodes () { if (node.takePosition !== undefined) { createPartFromNode(node.takePosition, stage, stage) } + if (node.positionSize !== undefined) { + createPartFromNode(node.positionSize, stage, stage) + } return } case 'Open Stage': { @@ -214,7 +217,7 @@ function newPartsFromNodes () { case 'Base Asset': { createPart('Base Asset', node.name, node, parentNode, chainParent, 'Base Asset') if (node.formula !== undefined) { - createPartFromNode(node.formula, node, nodes) + createPartFromNode(node.formula, node, node) } return } @@ -232,6 +235,9 @@ function newPartsFromNodes () { let strategy = node.strategies[m] createPartFromNode(strategy, tradingSystem, tradingSystem) } + if (node.parameters !== undefined) { + createPartFromNode(node.parameters, node, node) + } return } } diff --git a/StrategySpace/Workspace/FunctionLibraries/WorkspaceNode.js b/StrategySpace/Workspace/FunctionLibraries/WorkspaceNode.js index 4b8605c83..04e69a3fd 100644 --- a/StrategySpace/Workspace/FunctionLibraries/WorkspaceNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/WorkspaceNode.js @@ -201,6 +201,7 @@ function newWorkspaceNode () { triggerOn: getWorkspaceNode(node.triggerOn), triggerOff: getWorkspaceNode(node.triggerOff), takePosition: getWorkspaceNode(node.takePosition), + positionSize: getWorkspaceNode(node.positionSize), savedPayload: getSavedPayload(node) } return stage @@ -281,6 +282,7 @@ function newWorkspaceNode () { subType: node.subType, name: node.name, strategies: [], + parameters: getWorkspaceNode(node.parameters), savedPayload: getSavedPayload(node) } diff --git a/StrategySpace/Workspace/Workspace.js b/StrategySpace/Workspace/Workspace.js index f41dbdf4d..8602c2398 100644 --- a/StrategySpace/Workspace/Workspace.js +++ b/StrategySpace/Workspace/Workspace.js @@ -70,6 +70,7 @@ function newWorkspace () { let rootNode = rootNodes[i] functionLibraryPartsFromNodes.createPartFromNode(rootNode, undefined, undefined) } + console.log('paso por aca') isInitialized = true } }