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

Common Logic goes up

Browse Source
This commit is contained in:
Luis Fernando Molina committed 2019-02-27 15:35:36 +01:00
1 parent 797a9fb25f
commit f3e4639e1f
1 file changed
+34 -28
Download Patch File Download Diff File Expand all files Collapse all files
Multi-Period-Market/User.Bot.js
+34 -28
View File
@@ -606,6 +606,38 @@
strategy = 1;
}
/* Checking what happened since the last execution. We need to know if the Stop Loss
or our Buy Order were hit. */
/* Stop Loss condition: Here we verify if the Stop Loss was hitted or not. */
let buySignalActivated = false;
if (candle.max >= stopLoss && lastOperation === 'Sell') {
balanceAssetA = balanceAssetB / stopLoss;
//if (isNaN(balanceAssetA)) { balanceAssetA = 0; }
balanceAssetB = 0;
rate = stopLoss;
type = '"Buy@StopLoss"';
buySignalActivated = true;
}
/* Buy Order condition: Here we verify if the Buy Order was filled or not. */
if (candle.min <= buyOrder && lastOperation === 'Sell' && buySignalActivated === false) {
balanceAssetA = balanceAssetB / buyOrder;
//if (isNaN(balanceAssetA)) { balanceAssetA = 0; }
balanceAssetB = 0;
rate = buyOrder;
type = '"Buy@BuyOrder"';
buySignalActivated = true;
}
if (strategy === 1) {
/* Strategy #1: Trend Following. */
@@ -810,33 +842,7 @@
/* Common Logic */
/* Stop Loss condition: Here we verify if the Stop Loss was hitted or not. */
let buySignalActivated = false;
if (candle.max >= stopLoss && lastOperation === 'Sell') {
balanceAssetA = balanceAssetB / stopLoss;
//if (isNaN(balanceAssetA)) { balanceAssetA = 0; }
balanceAssetB = 0;
rate = stopLoss;
type = '"Buy@StopLoss"';
buySignalActivated = true;
}
if (candle.min <= buyOrder && lastOperation === 'Sell' && buySignalActivated === false) {
balanceAssetA = balanceAssetB / buyOrder;
//if (isNaN(balanceAssetA)) { balanceAssetA = 0; }
balanceAssetB = 0;
rate = buyOrder;
type = '"Buy@BuyOrder"';
buySignalActivated = true;
}
/* Here we define what to do if the conditions to buy were activated. */
if (buySignalActivated === true) {
@@ -914,7 +920,7 @@
previousStopLoss = stopLoss;
if (bollingerBandsMap.get(candles[i - 1].begin).movingAverage < band.movingAverage) {
if (band1.movingAverage < band.movingAverage) {
stopLossDecay = stopLossDecay + stopLossDecayIncrement * 2;
} else {
stopLossDecay = stopLossDecay - stopLossDecayIncrement / 2;