Bug Fixed takeProfit

This commit is contained in:
Luis Fernando Molina committed 2019-06-08 17:59:03 +02:00
1 parent 617c2641b4
commit bac96ad0d2
1 file changed
+3 -15
+3 -15
View File
@@ -1146,7 +1146,7 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
if (openStage.initialDefinition !== undefined) {
if (openStage.initialDefinition.takeProfit !== undefined) {
phase = openStage.initialDefinition.takeProfit.phases[takeProfitPhase - 1];
key = currentStrategyIndex + '-' + 'openStage' + '-' + 'initialDefinition' + '-' + 'takeProfit' + '-' + (stopLossPhase - 1);
key = currentStrategyIndex + '-' + 'openStage' + '-' + 'initialDefinition' + '-' + 'takeProfit' + '-' + (takeProfitPhase - 1);
}
}
}
@@ -1154,24 +1154,12 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
if (takeProfitStage === 'Manage Stage' && manageStage !== undefined) {
if (manageStage.takeProfit !== undefined) {
phase = manageStage.takeProfit.phases[takeProfitPhase - 2];
key = currentStrategyIndex + '-' + 'manageStage' + '-' + 'takeProfit' + '-' + (stopLossPhase - 2);
key = currentStrategyIndex + '-' + 'manageStage' + '-' + 'takeProfit' + '-' + (takeProfitPhase - 2);
}
}
if (phase.formula !== undefined) {
try {
takeProfit = eval(phase.formula.code); // Here is where we apply the formula given for the stop loss.
if (takeProfit === Infinity) {
phase.formula.error = "Formula evaluates to Infinity."
takeProfit = MAX_TAKE_PROFIT_VALUE
}
} catch (err) {
phase.formula.error = err.message
}
if (isNaN(takeProfit)) { takeProfit = 0; }
if (takeProfit < MIN_TAKE_PROFIT_VALUE) {
takeProfit = MIN_TAKE_PROFIT_VALUE
}
takeProfit = formulas.get(key)
}
}