@@ -15318,6 +15318,8 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1531815318 & ((df["RSI_3_15m"] > 10.0) | (df["RSI_3_1d"] > 10.0) | (df["STOCHRSIk_14_14_3_3_4h"] < 40.0))
1531915319 # 15m & 4h down move, 4h still high
1532015320 & ((df["RSI_3_15m"] > 10.0) | (df["RSI_3_4h"] > 10.0) | (df["STOCHRSIk_14_14_3_3_4h"] < 40.0))
15321+ # 15m & 4h down move, 1d high
15322+ & ((df["RSI_3_15m"] > 10.0) | (df["RSI_3_4h"] > 20.0) | (df["STOCHRSIk_14_14_3_3_1d"] < 70.0))
1532115323 # 15m & 4h down move, 4h still not low enough
1532215324 & ((df["RSI_3_15m"] > 10.0) | (df["RSI_3_4h"] > 20.0) | (df["STOCHRSIk_14_14_3_3_4h"] < 30.0))
1532315325 # 15m & 4h down move, 1d high
@@ -15437,7 +15439,7 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1543715439 # 1h & 4h down move, 4h still not low enough
1543815440 & ((df["RSI_3_1h"] > 15.0) | (df["RSI_3_4h"] > 15.0) | (df["STOCHRSIk_14_14_3_3_4h"] < 20.0))
1543915441 # 1h & 4h down move, 1d high
15440- & ((df["RSI_3_1h"] > 15.0) | (df["RSI_3_4h"] > 15.0) | (df["STOCHRSIk_14_14_3_3_1d"] < 80 .0))
15442+ & ((df["RSI_3_1h"] > 15.0) | (df["RSI_3_4h"] > 15.0) | (df["STOCHRSIk_14_14_3_3_1d"] < 70 .0))
1544115443 # 1h & 4h down move, 4h high
1544215444 & ((df["RSI_3_1h"] > 15.0) | (df["RSI_3_4h"] > 20.0) | (df["AROONU_14_4h"] < 70.0))
1544315445 # 1h & 4h down move, 1d downtrend
0 commit comments