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

checkTriggerOn re implemented

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-06-04 21:24:41 +02:00
1 parent e552d6fd4e
commit 0cbf840149
1 file changed
+21 -16
Download Patch File Download Diff File Expand all files Collapse all files
Commons.js
+21 -16
View File
@@ -347,29 +347,34 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
let strategy = tradingSystem.strategies[j];
for (let k = 0; k < strategy.triggerOn.situations.length; k++) {
let triggerStage = strategy.triggerStage
let situation = strategy.triggerOn.situations[k];
let passed = true;
if (triggerStage !== undefined) {
for (let m = 0; m < situation.conditions.length; m++) {
for (let k = 0; k < triggerStage.triggerOn.situations.length; k++) {
let condition = situation.conditions[m];
let key = strategy.name + '-' + situation.name + '-' + condition.name
let situation = triggerStage.triggerOn.situations[k];
let passed = true;
let value = conditions.get(key).value;
for (let m = 0; m < situation.conditions.length; m++) {
if (value === false) { passed = false; }
}
let condition = situation.conditions[m];
let key = j + '-' + 'triggerStage' + '-' + 'triggerOn' + '-' + k + '-' + m;
if (passed) {
let value = conditions.get(key).value;
strategyStage = 'Trigger Stage';
currentStrategyNumber = j + 1;
currentStrategy.begin = candle.begin;
currentStrategy.beginRate = candle.min;
currentStrategy.endRate = candle.min; // In case the strategy does not get exited
return;
if (value === false) { passed = false; }
}
if (passed) {
strategyStage = 'Trigger Stage';
currentStrategyNumber = j + 1;
currentStrategy.begin = candle.begin;
currentStrategy.beginRate = candle.min;
currentStrategy.endRate = candle.min; // In case the strategy does not get exited
return;
}
}
}
}