Update StackingDemo.py

This commit is contained in:
incrementby1 2021-10-26 00:34:01 +02:00 committed by GitHub
parent c3f3bdaa2a
commit 9c6cbc025a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 10 deletions

View File

@ -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