diff --git a/NostalgiaForInfinityX5.py b/NostalgiaForInfinityX5.py index 23254eb875..2ff50de612 100644 --- a/NostalgiaForInfinityX5.py +++ b/NostalgiaForInfinityX5.py @@ -67,7 +67,7 @@ class NostalgiaForInfinityX5(IStrategy): INTERFACE_VERSION = 3 def version(self) -> str: - return "v15.1.318" + return "v15.1.319" stoploss = -0.99 @@ -5306,17 +5306,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["STOCHk_14_3_3_4h"] < 50.0) | (df["STOCHRSIk_14_14_3_3_4h"] < 50.0) ) - # 5m & 15m & 1h down move, 15m still not low enough, 1h & 4h & 1d still high - & ( - (df["RSI_3"] > 5.0) - | (df["RSI_3_15m"] > 25.0) - | (df["RSI_3_1h"] > 40.0) - | (df["AROONU_14_15m"] < 25.0) - | (df["STOCHRSIk_14_14_3_3_15m"] < 10.0) - | (df["AROONU_14_1h"] < 50.0) - | (df["STOCHRSIk_14_14_3_3_4h"] < 80.0) - | (df["STOCHRSIk_14_14_3_3_1d"] < 50.0) - ) # 5m & 15m & 1h & 4h & 1d down move, 15m & 1h & 4h still not low enough. 1 still not low enough & downtrend & ( (df["RSI_3"] > 10.0) @@ -5633,16 +5622,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["AROONU_14_1d"] < 50.0) | (df["STOCHRSIk_14_14_3_3_1d"] < 50.0) ) - # 15m & 1h down move, 15m still not low enough, 1h & 4h still high, 1d downtrend - & ( - (df["RSI_3_15m"] > 5.0) - | (df["RSI_3_1h"] > 45.0) - | (df["AROONU_14_15m"] < 25.0) - | (df["STOCHRSIk_14_14_3_3_15m"] < 25.0) - | (df["AROONU_14_1h"] < 50.0) - | (df["STOCHRSIk_14_14_3_3_4h"] < 50.0) - | (df["ROC_9_1d"] > -25.0) - ) # 15m & 1h & 4h & 1d down move, 15m & 1h & 4h & 1d still not low enough & ( (df["RSI_3_15m"] > 10.0) @@ -5679,17 +5658,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["RSI_14_1d"] < 30.0) | (df["MFI_14_1d"] < 30.0) ) - # 15m & 1h & 4h & 1d down move, 15m & 1h & 4h & 1d still not low enough - & ( - (df["RSI_3_15m"] > 10.0) - | (df["RSI_3_1h"] > 20.0) - | (df["RSI_3_4h"] > 5.0) - | (df["RSI_3_1d"] > 30.0) - | (df["STOCHRSIk_14_14_3_3_15m"] < 25.0) - | (df["UO_7_14_28_1h"] < 30.0) - | (df["UO_7_14_28_4h"] < 30.0) - | (df["STOCHRSIk_14_14_3_3_1d"] < 30.0) - ) # 15m & 1h & 4h down move, 1h & 4h & 1d still not low enough & ( (df["RSI_3_15m"] > 10.0) @@ -5947,17 +5915,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["AROONU_14_1d"] < 75.0) | (df["STOCHk_14_3_3_1d"] < 40.0) ) - # 15m & 4h & 1d down move, 15m & 1h & 4h & 1d still not low enough, 1d downtrend - & ( - (df["RSI_3_15m"] > 10.0) - | (df["RSI_3_4h"] > 40.0) - | (df["RSI_3_1d"] > 35.0) - | (df["STOCHRSIk_14_14_3_3_15m"] < 30.0) - | (df["STOCHRSIk_14_14_3_3_1h"] < 20.0) - | (df["STOCHRSIk_14_14_3_3_4h"] < 40.0) - | (df["STOCHRSIk_14_14_3_3_1d"] < 10.0) - | (df["ROC_9_1d"] > -30.0) - ) # 15m & 1h & 4h & 1d down move, 15m & 1h & 4h & 1d still not low enough & ( (df["RSI_3_15m"] > 10.0) @@ -6540,17 +6497,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["STOCHk_14_3_3_4h"] < 20.0) | (df["RSI_14_1d"] < 40.0) ) - # 15m & 1h & 4h * 1d down move, 15m high, 4h still not low enough, 1d still high, 4h downtrend - & ( - (df["RSI_3_15m"] > 20.0) - | (df["RSI_3_1h"] > 20.0) - | (df["RSI_3_4h"] > 20.0) - | (df["RSI_3_1d"] > 25.0) - | (df["STOCHRSIk_14_14_3_3_15m"] < 70.0) - | (df["STOCHRSIk_14_14_3_3_4h"] < 20.0) - | (df["AROONU_14_1d"] < 50.0) - | (df["ROC_9_4h"] > -20.0) - ) # 15m & 1h & 4h & 1d down move, 15m & 4h still not low enough, 1d downtrend & ( (df["RSI_3_15m"] > 20.0) @@ -6616,16 +6562,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["STOCHRSIk_14_14_3_3_4h"] < 20.0) | (df["MFI_14_1d"] < 50.0) ) - # 15m & 1h & 4h & 1d down move, 15m high, 1h still high, 4h downtrend - & ( - (df["RSI_3_15m"] > 30.0) - | (df["RSI_3_1h"] > 35.0) - | (df["RSI_3_4h"] > 5.0) - | (df["RSI_3_1d"] > 15.0) - | (df["STOCHRSIk_14_14_3_3_15m"] < 50.0) - | (df["STOCHRSIk_14_14_3_3_1h"] < 10.0) - | (df["ROC_9_4h"] > -20.0) - ) # 15m & 4h & 1d down move, 15m & 1h & 4h still not low enough, 1d still high & ( (df["RSI_3_15m"] > 30.0) @@ -6951,22 +6887,6 @@ def populate_indicators(self, df: DataFrame, metadata: dict) -> DataFrame: | (df["ROC_2_1d"] > -25.0) | (df["ROC_9_1d"] > -25.0) ) - & ( - # 15m still not low enough, 4h & 1d down move, 1d downtrend - (df["STOCHRSIk_14_14_3_3_15m"] < 5.0) - | (df["AROONU_14_15m"] < 25.0) - | (df["RSI_3_4h"] > 10.0) - | (df["RSI_3_1d"] > 10.0) - | (df["ROC_9_1d"] > -30.0) - ) - # 15m & 4h still not low enough, 1h & 4h & 1d down move - & ( - (df["STOCHRSIk_14_14_3_3_15m"] < 10.0) - | (df["STOCHRSIk_14_14_3_3_4h"] < 30.0) - | (df["RSI_3_1h"] > 15.0) - | (df["RSI_3_4h"] > 30.0) - | (df["RSI_3_1d"] > 30.0) - ) # 1h green with top wick, 15m high, 1h & 4h still high & ( (df["change_pct_1h"] < 10.0)