From 3f1b48ba94ea8812ac4af482763fb9fd55cc2a13 Mon Sep 17 00:00:00 2001 From: Gert Wohlgemuth Date: Mon, 30 Apr 2018 16:25:01 -0700 Subject: [PATCH] working on more strategies, Quicke is only one really working well so far --- user_data/strategies/Quickie.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/user_data/strategies/Quickie.py b/user_data/strategies/Quickie.py index d5d6266b4..c8346b0c0 100644 --- a/user_data/strategies/Quickie.py +++ b/user_data/strategies/Quickie.py @@ -60,11 +60,6 @@ class Quickie(IStrategy): (dataframe['tema'] > dataframe['tema'].shift(1)) & (dataframe['sma_200'] > dataframe['close']) ) - | - ( - (dataframe['sma_200'] > dataframe['close']) & - (dataframe['sma_50'] < dataframe['sma_200']) - ) ), 'buy'] = 1 return dataframe @@ -72,9 +67,11 @@ class Quickie(IStrategy): def populate_sell_trend(self, dataframe: DataFrame) -> DataFrame: dataframe.loc[ ( + ( (dataframe['adx'] > 70) & (dataframe['tema'] > dataframe['bb_middleband']) & (dataframe['tema'] < dataframe['tema'].shift(1)) + ) ), 'sell'] = 1 return dataframe