Skip to content

Commit 0c6b2c6

Browse files
committed
X7: signal 1: add protection.
1 parent f1fbe93 commit 0c6b2c6

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

NostalgiaForInfinityX7.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class NostalgiaForInfinityX7(IStrategy):
6969
INTERFACE_VERSION = 3
7070

7171
def version(self) -> str:
72-
return "v17.3.771"
72+
return "v17.3.772"
7373

7474
stoploss = -0.99
7575

@@ -12067,6 +12067,10 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1206712067
& ((df["RSI_3_15m"] > 10.0) | (df["RSI_3_1d"] > 50.0) | (df["STOCHRSIk_14_14_3_3_1d"] < 80.0))
1206812068
# 15m down move & downtrend, 4h high
1206912069
& ((df["RSI_3_15m"] > 10.0) | (df["CMF_20_15m"] > -0.3) | (df["AROONU_14_4h"] < 100.0))
12070+
# 15m down move, 1h high & overbought
12071+
& ((df["RSI_3_15m"] > 10.0) | (df["AROONU_14_1h"] < 90.0) | (df["ROC_9_1h"] < 20.0))
12072+
# 15m down move, 1h high, 1d downtrend
12073+
& ((df["RSI_3_15m"] > 10.0) | (df["AROONU_14_1h"] < 90.0) | (df["ROC_9_1d"] > -40.0))
1207012074
# 15m down move, 1h high, 1d overbought
1207112075
& ((df["RSI_3_15m"] > 10.0) | (df["AROONU_14_1h"] < 100.0) | (df["ROC_9_1d"] < 80.0))
1207212076
# 15m down move, 15m & 4h high
@@ -12151,6 +12155,8 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1215112155
& ((df["RSI_3_1h"] > 40.0) | (df["AROONU_14_1h"] < 80.0) | (df["ROC_9_1d"] < 100.0))
1215212156
# 1h down move, 1h & 4h high
1215312157
& ((df["RSI_3_1h"] > 45.0) | (df["AROONU_14_1h"] < 80.0) | (df["AROONU_14_4h"] < 100.0))
12158+
# 1h down move, 1h high & overbought
12159+
& ((df["RSI_3_1h"] > 50.0) | (df["AROONU_14_1h"] < 90.0) | (df["ROC_9_1h"] < 20.0))
1215412160
# 1h down move, 1h still high, 4h high
1215512161
& ((df["RSI_3_1h"] > 60.0) | (df["AROONU_14_1h"] < 50.0) | (df["RSI_14_4h"] < 90.0))
1215612162
# 4h & 1d down move, 4h still not low enough
@@ -12181,6 +12187,8 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1218112187
& ((df["RSI_3_change_pct_1h"] > -75.0) | (df["AROONU_14_4h"] < 90.0) | (df["ROC_9_1d"] < 100.0))
1218212188
# 15m & 1h & 4h downtrend
1218312189
& ((df["CMF_20_15m"] > -0.3) | (df["CMF_20_1h"] > -0.3) | (df["CMF_20_4h"] > -0.3))
12190+
# 1h high, 1h overbought, 1d downtrend
12191+
& ((df["AROONU_14_1h"] < 85.0) | (df["ROC_9_1h"] < 20.0) | (df["ROC_9_1d"] > -40.0))
1218412192
# 4h & 1d high, 1d overbought
1218512193
& ((df["AROONU_14_4h"] < 80.0) | (df["AROONU_14_1d"] < 100.0) | (df["ROC_9_1d"] < 50.0))
1218612194
# 1d high, 4h downtrend, 1d overbought
@@ -12199,6 +12207,8 @@ def populate_entry_trend(self, df: DataFrame, metadata: dict) -> DataFrame:
1219912207
)
1220012208
# 1h downtrend, 4h high & overbought
1220112209
& ((df["ROC_9_1h"] > -25.0) | (df["AROONU_14_4h"] < 80.0) | (df["ROC_9_4h"] < 80.0))
12210+
# 1h & 4h overbought, 1d downtrend
12211+
& ((df["ROC_9_1h"] < 20.0) | (df["ROC_9_4h"] < 20.0) | (df["ROC_9_1d"] > -40.0))
1220212212
# 1d P&D, 1d downtrend
1220312213
& ((df["change_pct_1d"] > -5.0) | (df["change_pct_1d"].shift(288) < 30.0) | (df["CMF_20_1d"] > -0.0))
1220412214
# 1d green with top wick, 1h down move

0 commit comments

Comments
 (0)