position rate implemented

This commit is contained in:
Luis Fernando Molina committed 2019-07-08 12:26:15 +02:00
1 parent 64bb38e728
commit 1725e388b9
11 files changed
+231 -53

No files matched your search

@@ -57,6 +57,11 @@ function newAttachDetach () {
completeDetachment(node, rootNodes)
return
}
case 'Position Rate': {
node.payload.parentNode.positionRate = undefined
completeDetachment(node, rootNodes)
return
}
case 'Trigger On Event': {
node.payload.parentNode.triggerOn = undefined
completeDetachment(node, rootNodes)
@@ -205,6 +210,13 @@ function newAttachDetach () {
completeAttachment(node, rootNodes)
}
break
case 'Position Rate': {
node.payload.parentNode = attachToNode
node.payload.chainParent = attachToNode
node.payload.parentNode.positionRate = node
completeAttachment(node, rootNodes)
}
break
case 'Initial Definition': {
node.payload.parentNode = attachToNode
node.payload.chainParent = attachToNode
@@ -35,6 +35,9 @@ function newNodeChildren () {
case 'Position Size': {
return countChildrenPositionSize(parentNode, childNode)
}
case 'Position Rate': {
return countChildrenPositionSize(parentNode, childNode)
}
case 'Initial Definition': {
return countChildrenInitialDefinition(parentNode, childNode)
}
@@ -183,12 +186,6 @@ function newNodeChildren () {
response.childIndex = response.childrenCount
}
}
if (parentNode.positionSize !== undefined) {
response.childrenCount++
if (parentNode.positionSize.id === childNode.id) {
response.childIndex = response.childrenCount
}
}
return response
}
@@ -248,11 +245,31 @@ function newNodeChildren () {
return response
}
function countChildrenPositionRate (parentNode, childNode) {
let response = {
childrenCount: 0,
childIndex: undefined
}
if (parentNode.formula !== undefined) {
response.childrenCount++
if (parentNode.formula.id === childNode.id) {
response.childIndex = response.childrenCount
}
}
return response
}
function countChildrenInitialDefinition (parentNode, childNode) {
let response = {
childrenCount: 0,
childIndex: undefined
}
if (parentNode.positionSize !== undefined) {
response.childrenCount++
if (parentNode.positionSize.id === childNode.id) {
response.childIndex = response.childrenCount
}
}
if (parentNode.stopLoss !== undefined) {
response.childrenCount++
if (parentNode.stopLoss.id === childNode.id) {
@@ -265,6 +282,12 @@ function newNodeChildren () {
response.childIndex = response.childrenCount
}
}
if (parentNode.positionRate !== undefined) {
response.childrenCount++
if (parentNode.positionRate.id === childNode.id) {
response.childIndex = response.childrenCount
}
}
return response
}
@@ -10,6 +10,7 @@ function newNodeDeleter () {
deleteManageStage: deleteManageStage,
deleteCloseStage: deleteCloseStage,
deletePositionSize: deletePositionSize,
deletePositionRate: deletePositionRate,
deleteInitialDefinition: deleteInitialDefinition,
deleteEvent: deleteEvent,
deleteManagedItem: deleteManagedItem,
@@ -67,6 +68,10 @@ function newNodeDeleter () {
deletePositionSize(rootNode, rootNodes)
break
}
case 'Position Rate': {
deletePositionRate(rootNode, rootNodes)
break
}
case 'Initial Definition': {
deleteInitialDefinition(rootNode, rootNodes)
break
@@ -213,9 +218,6 @@ function newNodeDeleter () {
if (node.takePosition !== undefined) {
deleteEvent(node.takePosition, rootNodes)
}
if (node.positionSize !== undefined) {
deletePositionSize(node.positionSize, rootNodes)
}
destroyPart(node)
cleanNode(node)
}
@@ -276,6 +278,20 @@ function newNodeDeleter () {
cleanNode(node)
}
function deletePositionRate (node, rootNodes) {
let payload = node.payload
if (payload.parentNode !== undefined) {
payload.parentNode.positionRate = undefined
} else {
completeDeletion(node, rootNodes)
}
if (node.formula !== undefined) {
deleteFormula(node.formula, rootNodes)
}
destroyPart(node)
cleanNode(node)
}
function deleteInitialDefinition (node, rootNodes) {
let payload = node.payload
if (payload.parentNode !== undefined) {
@@ -289,6 +305,12 @@ function newNodeDeleter () {
if (node.takeProfit !== undefined) {
deleteManagedItem(node.takeProfit, rootNodes)
}
if (node.positionSize !== undefined) {
deletePositionSize(node.positionSize, rootNodes)
}
if (node.positionRate !== undefined) {
deletePositionSize(node.positionRate, rootNodes)
}
destroyPart(node)
cleanNode(node)
}
@@ -7,7 +7,6 @@ function newPartsFromNodes () {
addMissingStages: addMissingStages,
addMissingEvents: addMissingEvents,
addMissingItems: addMissingItems,
addPositionSize: addPositionSize,
addInitialDefinition: addInitialDefinition,
addPhase: addPhase,
addFormula: addFormula,
@@ -112,6 +111,12 @@ function newPartsFromNodes () {
if (node.takeProfit !== undefined) {
createPartFromNode(node.takeProfit, node, node)
}
if (node.positionSize !== undefined) {
createPartFromNode(node.positionSize, stage, stage)
}
if (node.positionRate !== undefined) {
createPartFromNode(node.positionRate, stage, stage)
}
return
}
case 'Take Position Event': {
@@ -148,6 +153,13 @@ function newPartsFromNodes () {
}
return
}
case 'Position Rate': {
createPart('Position Rate', node.name, node, parentNode, chainParent, 'Position Rate')
if (node.formula !== undefined) {
createPartFromNode(node.formula, node, node)
}
return
}
case 'Trigger Stage': {
let stage = node
createPart('Trigger Stage', stage.name, stage, parentNode, chainParent, 'Trigger Stage')
@@ -161,9 +173,6 @@ function newPartsFromNodes () {
if (node.takePosition !== undefined) {
createPartFromNode(node.takePosition, stage, stage)
}
if (node.positionSize !== undefined) {
createPartFromNode(node.positionSize, stage, stage)
}
return
}
case 'Open Stage': {
@@ -298,11 +307,12 @@ function newPartsFromNodes () {
createPart('Trigger Off Event', '', strategy.triggerStage.triggerOff, strategy.triggerStage, strategy.triggerStage)
createPart('Take Position Event', '', strategy.triggerStage.takePosition, strategy.triggerStage, strategy.triggerStage)
createPart('Initial Definition', '', strategy.openStage.initialDefinition, strategy.openStage, strategy.openStage)
createPart('Position Size', '', strategy.openStage.initialDefinition.positionSize, strategy.openStage.initialDefinition, strategy.openStage.initialDefinition)
createPart('Position Rate', '', strategy.openStage.initialDefinition.positionRate, strategy.openStage.initialDefinition, strategy.openStage.initialDefinition)
createPart('Stop', '', strategy.manageStage.stopLoss, strategy.manageStage, strategy.manageStage)
createPart('Take Profit', '', strategy.manageStage.takeProfit, strategy.manageStage, strategy.manageStage)
createPart('Stop', 'Initial Stop', strategy.openStage.initialDefinition.stopLoss, strategy.openStage.initialDefinition, strategy.openStage.initialDefinition)
createPart('Take Profit', 'Initial Take Profit', strategy.openStage.initialDefinition.takeProfit, strategy.openStage.initialDefinition, strategy.openStage.initialDefinition)
createPart('Position Size', '', strategy.triggerStage.positionSize, strategy.triggerStage, strategy.triggerStage)
createPart('Formula', '', strategy.triggerStage.positionSize.formula, strategy.triggerStage.positionSize, strategy.triggerStage.positionSize)
}
@@ -351,7 +361,6 @@ function newPartsFromNodes () {
createPart('Trigger On Event', '', node.triggerStage.triggerOn, node.triggerStage, node.triggerStage)
createPart('Trigger Off Event', '', node.triggerStage.triggerOff, node.triggerStage, node.triggerStage)
createPart('Take Position Event', '', node.triggerStage.takePosition, node.triggerStage, node.triggerStage)
createPart('Position Size', '', node.triggerStage.positionSize, node.triggerStage, node.triggerStage)
createPart('Formula', '', node.triggerStage.positionSize.formula, node.triggerStage.positionSize, node.triggerStage.positionSize)
}
if (node.openStage === undefined) {
@@ -371,6 +380,8 @@ function newPartsFromNodes () {
createPart('Initial Definition', '', node.openStage.initialDefinition, node.openStage, node.openStage)
createPart('Stop', 'Initial Stop', node.openStage.initialDefinition.stopLoss, node.openStage.initialDefinition, node.openStage.initialDefinition)
createPart('Take Profit', 'Initial Take Profit', node.openStage.initialDefinition.takeProfit, node.openStage.initialDefinition, node.openStage.initialDefinition)
createPart('Position Size', 'Position Size', node.openStage.initialDefinition.positionSize, node.openStage.initialDefinition, node.openStage.initialDefinition)
createPart('Position Rate', 'Position Rate', node.openStage.initialDefinition.positionRate, node.openStage.initialDefinition, node.openStage.initialDefinition)
}
if (node.manageStage === undefined) {
node.manageStage = {
@@ -411,19 +422,6 @@ function newPartsFromNodes () {
}
}
function addPositionSize (node) {
if (node.positionSize === undefined) {
node.positionSize = {
name: 'Position Size',
formula: {
code: DEFAULT_FORMULA_TEXT
}
}
createPart('Position Size', '', node.positionSize, node, node)
createPart('Formula', '', node.positionSize.formula, node.positionSize, node.positionSize)
}
}
function addMissingItems (node) {
if (node.type === 'Initial Definition') {
if (node.stopLoss === undefined) {
@@ -440,6 +438,26 @@ function newPartsFromNodes () {
}
createPart('Take Profit', 'Initial Take Profit', node.takeProfit, node, node)
}
if (node.positionSize === undefined) {
node.positionSize = {
name: 'Position Size',
formula: {
code: DEFAULT_FORMULA_TEXT
}
}
createPart('Position Size', '', node.positionSize, node, node)
createPart('Formula', '', node.positionSize.formula, node.positionSize, node.positionSize)
}
if (node.positionRate === undefined) {
node.positionRate = {
name: 'Position Rate',
formula: {
code: DEFAULT_FORMULA_TEXT
}
}
createPart('Position Rate', '', node.positionRate, node, node)
createPart('Formula', '', node.positionRate.formula, node.positionRate, node.positionRate)
}
} else {
if (node.stopLoss === undefined) {
node.stopLoss = {
@@ -164,6 +164,15 @@ function newProtocolNode () {
}
return object
}
case 'Position Rate': {
let object = {
type: node.type,
subType: node.subType,
name: node.name,
formula: getProtocolNode(node.formula)
}
return object
}
case 'Trigger Stage': {
let stage = {
type: node.type,
@@ -192,6 +192,17 @@ function newStringifyNode () {
}
return object
}
case 'Position Rate': {
let object = {
id: node.id,
type: node.type,
subType: node.subType,
name: node.name,
formula: prepareForStringify(node.formula),
savedPayload: getSavedPayload(node)
}
return object
}
case 'Trigger Stage': {
let stage = {
id: node.id,