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

Removing values from tradingSystem structure

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-06-08 15:39:43 +02:00
1 parent 1cf6b72545
commit d7266af111
1 file changed
+7 -11
Download Patch File Download Diff File Expand all files Collapse all files
Commons.js
+7 -11
View File
@@ -578,21 +578,22 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
let condition;
let error = ''
let value
try {
node.value = eval(node.code);
value = eval(node.code);
} catch (err) {
/*
One possible error is that the conditions references a .previous that is undefined. For this
reason and others, we will simply set the value to false.
*/
node.value = false
value = false
node.error = err.message
}
condition = {
key: key,
value: node.value
value: value
};
conditions.set(condition.key, condition);
@@ -946,12 +947,10 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
if (phase.formula !== undefined) {
try {
phase.formula.value = eval(phase.formula.code); // Here is where we apply the formula given for the stop loss.
stopLoss = phase.formula.value
stopLoss = eval(phase.formula.code); // Here is where we apply the formula given for the stop loss.
if (stopLoss === Infinity) {
phase.formula.error = "Formula evaluates to Infinity."
stopLoss = MAX_STOP_LOSS_VALUE
phase.formula.value = stopLoss
}
} catch (err) {
phase.formula.error = err.message
@@ -1060,12 +1059,10 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
if (phase.formula !== undefined) {
try {
phase.formula.value = eval(phase.formula.code); // Here is where we apply the formula given for the stop loss.
takeProfit = phase.formula.value
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
phase.formula.value = takeProfit
}
} catch (err) {
phase.formula.error = err.message
@@ -1099,8 +1096,7 @@ exports.newCommons = function newCommons(bot, logger, UTILITIES) {
if (triggerStage.positionSize !== undefined) {
if (triggerStage.positionSize.formula !== undefined) {
try {
triggerStage.positionSize.formula.value = eval(triggerStage.positionSize.formula.code);
positionSize = triggerStage.positionSize.formula.value
positionSize = eval(triggerStage.positionSize.formula.code);
} catch (err) {
triggerStage.positionSize.formula.error = err.message
}