diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 65bdc0178..920daeda7 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -231,8 +231,8 @@ function newStrategyPart () { compatibleSubType = undefined break case 'Parameters': - compatibleType = '->' + 'Trading System' + '->' - compatibleSubType = undefined + compatibleType = '->' + 'Trading System' + '->' + 'Process' + '->' + compatibleSubType = '->' + 'Trading Engine Process' + '->' break case 'Base Asset': compatibleType = '->' + 'Parameters' + '->' @@ -419,6 +419,14 @@ function newStrategyPart () { if (thisObject.payload.node.type === 'Formula' && nearbyNode.formula !== undefined) { continue } if (thisObject.payload.node.type === 'Next Phase Event' && nearbyNode.nextPhaseEvent !== undefined) { continue } if (thisObject.payload.node.type === 'Code' && nearbyNode.code !== undefined) { continue } + /* Here we check if the subtypes are compatible. */ + if (nearbyNode.subType !== undefined) { + if (compatibleSubType.indexOf('->' + nearbyNode.subType + '->') >= 0) { + if (thisObject.payload.node.type === 'Parameters' && nearbyNode.parameters !== undefined) { continue } + } else { + continue + } + } /* Discard Phases without partent */ if (thisObject.payload.node.type === 'Phase' && nearbyNode.type === 'Phase' && nearbyNode.payload.parentNode === undefined) { continue } /* Control maxPhases */ diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js index eb0e04d59..ae42f7584 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeChildren.js @@ -280,6 +280,12 @@ function newNodeChildren () { childrenCount: 0, childIndex: undefined } + if (parentNode.parameters !== undefined) { + response.childrenCount++ + if (parentNode.parameters.id === childNode.id) { + response.childIndex = response.childrenCount + } + } return response } diff --git a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js index 143a43c1e..eebcbbeb6 100644 --- a/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js +++ b/StrategySpace/Workspace/FunctionLibraries/NodeDeleter.js @@ -364,6 +364,11 @@ function newNodeDeleter () { } } } + + if (node.parameters !== undefined) { + deleteParameters(node.parameters, rootNodes) + } + completeDeletion(node, rootNodes) destroyPart(node) cleanNode(node) diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js index da5bdb53e..a53da91e5 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -424,6 +424,9 @@ function newPartsFromNodes () { } } createPart('Process', node.name, node, parentNode, chainParent, 'Process') + if (node.parameters !== undefined) { + createPartFromNode(node.parameters, node, node) + } return } } diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js index 68dedf6a5..5f32966e6 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -443,7 +443,8 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - code: node.code + code: node.code, + parameters: getProtocolNode(node.parameters, removePersonalData, parseJSONStrings, includeIds) } if (parseJSONStrings) { object.code = JSON.parse(object.code) diff --git a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js index 30966c11e..a00da357a 100644 --- a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js @@ -524,6 +524,7 @@ function newStringifyNode () { subType: node.subType, name: node.name, code: node.code, + parameters: prepareForStringify(node.parameters, removePersonalData), savedPayload: getSavedPayload(node) } return object