From 9c6cbc025aa6886bf551080869d1368e7d480591 Mon Sep 17 00:00:00 2001
From: incrementby1 <91958753+incrementby1@users.noreply.github.com>
Date: Tue, 26 Oct 2021 00:34:01 +0200
Subject: [PATCH] Update StackingDemo.py

---
 StackingDemo.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/StackingDemo.py b/StackingDemo.py
index 739e847b7..b88248fac 100644
--- a/StackingDemo.py
+++ b/StackingDemo.py
@@ -73,8 +73,8 @@ class StackingDemo(IStrategy):
     # Minimal ROI designed for the strategy.
     # This attribute will be overridden if the config file contains "minimal_roi".
     minimal_roi = {
-#        "60": 0.01,
-#        "30": 0.02,
+        "60": 0.01,
+        "30": 0.02,
         "0": 0.001
     }
 
@@ -403,10 +403,9 @@ class StackingDemo(IStrategy):
         dataframe.loc[
             (
                 (
-#                    (qtpylib.crossed_above(dataframe['rsi'], 30)) &  # Signal: RSI crosses above 30
-#                    (dataframe['tema'] <= dataframe['bb_middleband']) &  # Guard: tema below BB middle
-#                    (dataframe['tema'] > dataframe['tema'].shift(1)) |  # Guard: tema is raising
-                    (dataframe['close'] < dataframe['close'].shift(1)) |
+                    (qtpylib.crossed_above(dataframe['rsi'], 30)) &  # Signal: RSI crosses above 30
+                    (dataframe['tema'] <= dataframe['bb_middleband']) &  # Guard: tema below BB middle
+                    (dataframe['tema'] > dataframe['tema'].shift(1)) |  # Guard: tema is raising
                     # use either buy signal or rebuy flag to trigger a buy
                     (self.custom_info[metadata["pair"]]["rebuy"] == 1)
                 ) &
@@ -426,11 +425,10 @@ class StackingDemo(IStrategy):
         dataframe.loc[
             (
                 (
-#                    (qtpylib.crossed_above(dataframe['rsi'], 70)) &  # Signal: RSI crosses above 70
-#                    (dataframe['tema'] > dataframe['bb_middleband']) &  # Guard: tema above BB middle
-#                    (dataframe['tema'] < dataframe['tema'].shift(1)) |  # Guard: tema is falling
+                    (qtpylib.crossed_above(dataframe['rsi'], 70)) &  # Signal: RSI crosses above 70
+                    (dataframe['tema'] > dataframe['bb_middleband']) &  # Guard: tema above BB middle
+                    (dataframe['tema'] < dataframe['tema'].shift(1)) |  # Guard: tema is falling
                     # use either sell signal or resell flag to trigger a sell
-                    (dataframe['close'] > dataframe['close'].shift(1)) |
                     (self.custom_info[metadata["pair"]]["resell"] == 1)
                 ) &
                 (dataframe['volume'] > 0)  # Make sure Volume is not 0