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

Bug Fixed, not controling if positioned at yesterday

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-10-10 15:57:53 +02:00
1 parent d6e9da30bb
commit 91ceec5f35
1 file changed
+26 -8
Download Patch File Download Diff File Expand all files Collapse all files
Commons.js
+26 -8
View File
@@ -1470,7 +1470,9 @@
stopLoss = formulas.get(key)
if (processingDailyFiles) {
yesterday.stopLoss = stopLoss
if (positionedAtYesterday) {
yesterday.stopLoss = stopLoss
}
}
}
}
@@ -1588,7 +1590,9 @@
if (phase.formula !== undefined) {
takeProfit = formulas.get(key)
if (processingDailyFiles) {
yesterday.takeProfit = takeProfit
if (positionedAtYesterday) {
yesterday.takeProfit = takeProfit
}
}
}
}
@@ -1691,6 +1695,7 @@
if ((bot.VALUES_TO_USE.baseAsset === 'BTC' && candle.max >= stopLoss) || (bot.VALUES_TO_USE.baseAsset !== 'BTC' && candle.min <= stopLoss)) {
if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] runSimulation -> loop -> Stop Loss was hit."); }
/*
Hit Point Validation
@@ -1702,14 +1707,18 @@
if (stopLoss < candle.min) {
stopLoss = candle.min
if (processingDailyFiles) {
yesterday.stopLoss = stopLoss
if (positionedAtYesterday) {
yesterday.stopLoss = stopLoss
}
}
}
} else {
if (stopLoss > candle.max) {
stopLoss = candle.max
if (processingDailyFiles) {
yesterday.stopLoss = stopLoss
if (positionedAtYesterday) {
yesterday.stopLoss = stopLoss
}
}
}
}
@@ -1783,6 +1792,7 @@
if ((bot.VALUES_TO_USE.baseAsset === 'BTC' && candle.min <= takeProfit) || (bot.VALUES_TO_USE.baseAsset !== 'BTC' && candle.max >= takeProfit)) {
if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] runSimulation -> loop -> Take Profit was hit."); }
/*
Hit Point Validation:
@@ -1794,14 +1804,18 @@
if (takeProfit > candle.max) {
takeProfit = candle.max
if (processingDailyFiles) {
yesterday.takeProfit = takeProfit
if (positionedAtYesterday) {
yesterday.takeProfit = takeProfit
}
}
}
} else {
if (takeProfit < candle.min) {
takeProfit = candle.min
if (processingDailyFiles) {
yesterday.takeProfit = takeProfit
if (positionedAtYesterday) {
yesterday.takeProfit = takeProfit
}
}
}
}
@@ -2412,11 +2426,15 @@
stopLoss = 0;
if (processingDailyFiles) {
yesterday.stopLoss = stopLoss
if (positionedAtYesterday) {
yesterday.stopLoss = stopLoss
}
}
takeProfit = 0;
if (processingDailyFiles) {
yesterday.takeProfit = takeProfit
if (positionedAtYesterday) {
yesterday.takeProfit = takeProfit
}
}
tradePositionRate = 0;