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

repositioning Take Position function

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-06-05 13:53:09 +02:00
1 parent 2ec63a94fa
commit 3a9c5c82f0
1 file changed
+46 -46
Download Patch File Download Diff File Expand all files Collapse all files
Commons.js
+46 -46
View File
@@ -648,52 +648,6 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
}
}
/* Take Position Condition */
if (strategyStage === 'Trigger Stage') {
let strategy = tradingSystem.strategies[currentStrategyIndex];
let triggerStage = strategy.triggerStage
if (triggerStage !== undefined) {
if (triggerStage.takePosition !== undefined) {
for (let k = 0; k < triggerStage.takePosition.situations.length; k++) {
let situation = triggerStage.takePosition.situations[k];
let passed = true;
for (let m = 0; m < situation.conditions.length; m++) {
let condition = situation.conditions[m];
let key = currentStrategyIndex + '-' + 'triggerStage' + '-' + 'takePosition' + '-' + k + '-' + m;
let value = conditions.get(key).value;
if (value === false) { passed = false; }
}
if (passed) {
type = '"Sell"';
strategyStage = 'Open Stage';
stopLossStage = 'Open Stage';
takeProfitStage = 'Open Stage';
stopLossPhase = 1;
takeProfitPhase = 1;
currentTrade.begin = candle.begin;
currentTrade.beginRate = candle.close;
takePositionNow = true
break;
}
}
}
}
}
/* Checking if Stop or Take Profit were hit */
if (
@@ -766,6 +720,52 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
}
}
/* Take Position Condition */
if (strategyStage === 'Trigger Stage') {
let strategy = tradingSystem.strategies[currentStrategyIndex];
let triggerStage = strategy.triggerStage
if (triggerStage !== undefined) {
if (triggerStage.takePosition !== undefined) {
for (let k = 0; k < triggerStage.takePosition.situations.length; k++) {
let situation = triggerStage.takePosition.situations[k];
let passed = true;
for (let m = 0; m < situation.conditions.length; m++) {
let condition = situation.conditions[m];
let key = currentStrategyIndex + '-' + 'triggerStage' + '-' + 'takePosition' + '-' + k + '-' + m;
let value = conditions.get(key).value;
if (value === false) { passed = false; }
}
if (passed) {
type = '"Sell"';
strategyStage = 'Open Stage';
stopLossStage = 'Open Stage';
takeProfitStage = 'Open Stage';
stopLossPhase = 1;
takeProfitPhase = 1;
currentTrade.begin = candle.begin;
currentTrade.beginRate = candle.close;
takePositionNow = true
break;
}
}
}
}
}
/* Stop Loss Management */
if (