fez5587/Superalgos
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG FIXES: Position Rate implementation

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-07-08 16:18:38 +02:00
1 parent 635b7cb087
commit 5d2f96a874
3 files changed
+12 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js
+6 -2
View File
@@ -112,10 +112,10 @@ function newPartsFromNodes () {
createPartFromNode(node.takeProfit, node, node)
}
if (node.positionSize !== undefined) {
createPartFromNode(node.positionSize, stage, stage)
createPartFromNode(node.positionSize, node, node)
}
if (node.positionRate !== undefined) {
createPartFromNode(node.positionRate, stage, stage)
createPartFromNode(node.positionRate, node, node)
}
return
}
@@ -489,6 +489,10 @@ function newPartsFromNodes () {
createPart('Initial Definition', '', node.initialDefinition, node, node)
createPart('Stop', 'Initial Stop', node.initialDefinition.stopLoss, node.initialDefinition, node.initialDefinition)
createPart('Take Profit', 'Initial Take Profit', node.initialDefinition.takeProfit, node.initialDefinition, node.initialDefinition)
createPart('Position Size', '', node.initialDefinition.positionSize, node.initialDefinition, node.initialDefinition)
createPart('Formula', '', node.initialDefinition.positionSize.formula, node.initialDefinition.positionSize, node.initialDefinition.positionSize)
createPart('Position Rate', '', node.initialDefinition.positionRate, node.initialDefinition, node.initialDefinition)
createPart('Formula', '', node.initialDefinition.positionRate.formula, node.initialDefinition.positionRate, node.initialDefinition.positionRate)
}
}
StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js
+4 -3
View File
@@ -151,7 +151,9 @@ function newProtocolNode () {
subType: node.subType,
name: node.name,
stopLoss: getProtocolNode(node.stopLoss),
takeProfit: getProtocolNode(node.takeProfit)
takeProfit: getProtocolNode(node.takeProfit),
positionSize: getProtocolNode(node.positionSize),
positionRate: getProtocolNode(node.positionRate)
}
return object
}
@@ -180,8 +182,7 @@ function newProtocolNode () {
name: node.name,
triggerOn: getProtocolNode(node.triggerOn),
triggerOff: getProtocolNode(node.triggerOff),
takePosition: getProtocolNode(node.takePosition),
positionSize: getProtocolNode(node.positionSize)
takePosition: getProtocolNode(node.takePosition)
}
return stage
}
StrategySpace/Workspace/FunctionLibraries/StringifyNode.js
+2 -1
View File
@@ -177,6 +177,8 @@ function newStringifyNode () {
name: node.name,
stopLoss: prepareForStringify(node.stopLoss),
takeProfit: prepareForStringify(node.takeProfit),
positionSize: prepareForStringify(node.positionSize),
positionRate: prepareForStringify(node.positionRate),
savedPayload: getSavedPayload(node)
}
return object
@@ -212,7 +214,6 @@ function newStringifyNode () {
triggerOn: prepareForStringify(node.triggerOn),
triggerOff: prepareForStringify(node.triggerOff),
takePosition: prepareForStringify(node.takePosition),
positionSize: prepareForStringify(node.positionSize),
savedPayload: getSavedPayload(node)
}
return stage