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

missing nextPhaseEvent

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-06-05 16:00:10 +02:00
1 parent 3a9c5c82f0
commit ac588ce113
1 file changed
+36 -28
Download Patch File Download Diff File Expand all files Collapse all files
Commons.js
+36 -28
View File
@@ -811,27 +811,31 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
let phase = parentNode.stopLoss.phases[p];
for (let k = 0; k < phase.situations.length; k++) {
let nextPhaseEvent = phase.nextPhaseEvent;
if (nextPhaseEvent !== undefined) {
let situation = phase.situations[k];
let passed = true;
for (let k = 0; k < nextPhaseEvent.situations.length; k++) {
for (let m = 0; m < situation.conditions.length; m++) {
let situation = nextPhaseEvent.situations[k];
let passed = true;
let condition = situation.conditions[m];
let key = j + '-' + stageKey + initialDefinitionKey + '-' + 'stopLoss' + '-' + p + '-' + k + '-' + m;
for (let m = 0; m < situation.conditions.length; m++) {
let value = conditions.get(key).value;
let condition = situation.conditions[m];
let key = j + '-' + stageKey + initialDefinitionKey + '-' + 'stopLoss' + '-' + p + '-' + k + '-' + m;
if (value === false) { passed = false; }
}
let value = conditions.get(key).value;
if (passed) {
if (value === false) { passed = false; }
}
stopLossPhase++;
stopLossStage = 'Manage Stage'
if (takeProfitPhase > 1) { strategyStage = 'Manage Stage'}
return;
if (passed) {
stopLossPhase++;
stopLossStage = 'Manage Stage'
if (takeProfitPhase > 1) { strategyStage = 'Manage Stage' }
return;
}
}
}
}
@@ -915,27 +919,31 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
let phase = parentNode.takeProfit.phases[p];
for (let k = 0; k < phase.situations.length; k++) {
let nextPhaseEvent = phase.nextPhaseEvent;
if (nextPhaseEvent !== undefined) {
let situation = phase.situations[k];
let passed = true;
for (let k = 0; k < nextPhaseEvent.situations.length; k++) {
for (let m = 0; m < situation.conditions.length; m++) {
let situation = nextPhaseEvent.situations[k];
let passed = true;
let condition = situation.conditions[m];
let key = j + '-' + stageKey + initialDefinitionKey + '-' + 'takeProfit' + '-' + p + '-' + k + '-' + m;
for (let m = 0; m < situation.conditions.length; m++) {
let value = conditions.get(key).value;
let condition = situation.conditions[m];
let key = j + '-' + stageKey + initialDefinitionKey + '-' + 'takeProfit' + '-' + p + '-' + k + '-' + m;
if (value === false) { passed = false; }
}
let value = conditions.get(key).value;
if (passed) {
if (value === false) { passed = false; }
}
takeProfitPhase++;
takeProfitStage = 'Manage Stage'
if (stopLossPhase > 1) { strategyStage = 'Manage Stage' }
return;
if (passed) {
takeProfitPhase++;
takeProfitStage = 'Manage Stage'
if (stopLossPhase > 1) { strategyStage = 'Manage Stage' }
return;
}
}
}
}