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

BUG FIXED: some objects attaching where they should not

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-07-06 12:01:36 +02:00
1 parent 26af84911f
commit 43d858e2f0
1 file changed
+21 -21
Download Patch File Download Diff File Expand all files Collapse all files
FloatingSpace/StrategyPart.js
+21 -21
View File
@@ -197,83 +197,83 @@ function newStrategyPart () {
let compatibleSubType
switch (thisObject.payload.node.type) {
case 'Parameters':
compatibleType = 'Trading System'
compatibleType = '->' + 'Trading System'
compatibleSubType = undefined
break
case 'Base Asset':
compatibleType = 'Parameters'
compatibleType = '->' + 'Parameters'
compatibleSubType = undefined
break
case 'Strategy':
compatibleType = 'Trading System'
compatibleType = '->' + 'Trading System'
compatibleSubType = undefined
break
case 'Trigger Stage':
compatibleType = 'Strategy'
compatibleType = '->' + 'Strategy'
compatibleSubType = undefined
break
case 'Open Stage':
compatibleType = 'Strategy'
compatibleType = '->' + 'Strategy'
compatibleSubType = undefined
break
case 'Manage Stage':
compatibleType = 'Strategy'
compatibleType = '->' + 'Strategy'
compatibleSubType = undefined
break
case 'Close Stage':
compatibleType = 'Strategy'
compatibleType = '->' + 'Strategy'
compatibleSubType = undefined
break
case 'Position Size':
compatibleType = 'Trigger Stage'
compatibleType = '->' + 'Trigger Stage'
compatibleSubType = undefined
break
case 'Take Position Event':
compatibleType = 'Trigger Stage'
compatibleType = '->' + 'Trigger Stage'
compatibleSubType = undefined
break
case 'Trigger Off Event':
compatibleType = 'Trigger Stage'
compatibleType = '->' + 'Trigger Stage'
compatibleSubType = undefined
break
case 'Trigger On Event':
compatibleType = 'Trigger Stage'
compatibleType = '->' + 'Trigger Stage'
compatibleSubType = undefined
break
case 'Initial Definition':
compatibleType = 'Open Stage'
compatibleType = '->' + 'Open Stage'
compatibleSubType = undefined
break
case 'Stop':
compatibleType = 'Manage Stage' + '.' + 'Initial Definition'
compatibleType = '->' + 'Manage Stage' + '->' + 'Initial Definition'
compatibleSubType = undefined
break
case 'Take Profit':
compatibleType = 'Manage Stage' + '.' + 'Initial Definition'
compatibleType = '->' + 'Manage Stage' + '->' + 'Initial Definition'
compatibleSubType = undefined
break
case 'Phase':
compatibleType = 'Stop' + '.' + 'Take Profit' + '.' + 'Phase'
compatibleType = '->' + 'Stop' + '->' + 'Take Profit' + '->' + 'Phase'
compatibleSubType = undefined
break
case 'Formula':
compatibleType = 'Base Asset' + '.' + 'Position Size' + '.' + 'Phase'
compatibleType = '->' + 'Base Asset' + '->' + 'Position Size' + '->' + 'Phase'
compatibleSubType = undefined
break
case 'Next Phase Event':
compatibleType = 'Phase'
compatibleType = '->' + 'Phase'
compatibleSubType = undefined
break
case 'Situation':
compatibleType = 'Take Position Event' + '.' + 'Trigger On Event' + '.' + 'Trigger Off Event' + '.' + 'Next Phase Event'
compatibleType = '->' + 'Take Position Event' + '->' + 'Trigger On Event' + '->' + 'Trigger Off Event' + '->' + 'Next Phase Event'
compatibleSubType = undefined
break
case 'Condition':
compatibleType = 'Situation'
compatibleType = '->' + 'Situation'
compatibleSubType = undefined
break
case 'Code':
compatibleType = 'Condition'
compatibleType = '->' + 'Condition'
compatibleSubType = undefined
break
default:
@@ -288,7 +288,7 @@ function newStrategyPart () {
let distance = nearby[0]
let floatingObject = nearby[1]
let nearbyNode = floatingObject.payload.node
if (compatibleType.indexOf(nearbyNode.type) >= 0) {
if (compatibleType.indexOf('->' + nearbyNode.type) >= 0) {
/* Discard objects with busy coonection ports */
if (thisObject.payload.node.type === 'Parameters' && nearbyNode.parameters !== undefined) { continue }
if (thisObject.payload.node.type === 'Base Asset' && nearbyNode.baseAsset !== undefined) { continue }