@@ -18264,6 +18264,8 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1826418264 & ((df["RSI_3_15m"] > 3.0) | (df["AROONU_14_1d"] < 70.0) | (df["ROC_9_1d"] < 10.0))
1826518265 # 15m & 1h down move, 4h still high
1826618266 & ((df["RSI_3_15m"] > 5.0) | (df["RSI_3_1h"] > 10.0) | (df["STOCHRSIk_14_14_3_3_4h"] < 50.0))
18267+ # 15m & 1h down move, 1h still high
18268+ & ((df["RSI_3_15m"] > 5.0) | (df["RSI_3_1h"] > 25.0) | (df["STOCHRSIk_14_14_3_3_1h"] < 50.0))
1826718269 # 15m & 1h down move, 1h high
1826818270 & ((df["RSI_3_15m"] > 5.0) | (df["RSI_3_1h"] > 30.0) | (df["STOCHRSIk_14_14_3_3_1h"] < 80.0))
1826918271 # 15m & 4h down move, 1d high
@@ -18398,6 +18400,10 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1839818400 & ((df["RSI_3_1h"] > 25.0) | (df["RSI_3_4h"] > 25.0) | (df["STOCHRSIk_14_14_3_3_15m"] < 70.0))
1839918401 # 1h & 4h down move, 1h high
1840018402 & ((df["RSI_3_1h"] > 25.0) | (df["RSI_3_4h"] > 30.0) | (df["AROONU_14_1h"] < 80.0))
18403+ # 1h down move, 1d high & overbought
18404+ & ((df["RSI_3_1h"] > 30.0) | (df["AROONU_14_1d"] < 85.0) | (df["ROC_9_1d"] < 40.0))
18405+ # 1h down move, 1d high & overbought
18406+ & ((df["RSI_3_1h"] > 30.0) | (df["STOCHRSIk_14_14_3_3_1d"] < 80.0) | (df["ROC_9_1d"] < 40.0))
1840118407 # 1h down move, 15m still high, 1h high
1840218408 & ((df["RSI_3_1h"] > 30.0) | (df["AROONU_14_15m"] < 50.0) | (df["AROONU_14_1h"] < 85.0))
1840318409 # 1h down move, 4h high, 1d overbought
0 commit comments