Skip to content

Commit 92e28fb

Browse files
committed
Buy 11: rework.
1 parent 72432b7 commit 92e28fb

File tree

1 file changed

+26
-22
lines changed

1 file changed

+26
-22
lines changed

NostalgiaForInfinityNext.py

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -488,21 +488,21 @@ class NostalgiaForInfinityNext(IStrategy):
488488
11: {
489489
"ema_fast" : False,
490490
"ema_fast_len" : "50",
491-
"ema_slow" : False,
492-
"ema_slow_len" : "50",
491+
"ema_slow" : True,
492+
"ema_slow_len" : "20",
493493
"close_above_ema_fast" : False,
494494
"close_above_ema_fast_len" : "200",
495495
"close_above_ema_slow" : False,
496496
"close_above_ema_slow_len" : "200",
497497
"sma200_rising" : False,
498-
"sma200_rising_val" : "50",
499-
"sma200_1h_rising" : False,
500-
"sma200_1h_rising_val" : "50",
501-
"safe_dips" : False,
502-
"safe_dips_type" : "100",
498+
"sma200_rising_val" : "24",
499+
"sma200_1h_rising" : True,
500+
"sma200_1h_rising_val" : "36",
501+
"safe_dips" : True,
502+
"safe_dips_type" : "60",
503503
"safe_pump" : False,
504-
"safe_pump_type" : "50",
505-
"safe_pump_period" : "24",
504+
"safe_pump_type" : "120",
505+
"safe_pump_period" : "36",
506506
"btc_1h_not_downtrend" : False,
507507
"close_over_pivot_type" : "none", # pivot, sup1, sup2, sup3, res1, res2, res3
508508
"close_over_pivot_offset" : 1.0,
@@ -1677,14 +1677,17 @@ class NostalgiaForInfinityNext(IStrategy):
16771677
buy_10_cti_1h_max = 0.94
16781678
buy_10_r_480_1h_max = -5.0
16791679

1680-
buy_11_ma_offset = 0.955
1681-
buy_11_min_inc = 0.038
1682-
buy_11_rsi_1h_min = 46.0
1680+
buy_11_ma_offset = 0.956
1681+
buy_11_min_inc = 0.022
1682+
buy_11_rsi_max = 37.0
1683+
buy_11_mfi_max = 46.0
1684+
buy_11_cci_max = -120.0
1685+
buy_11_r_480_max = -32.0
1686+
buy_11_rsi_1h_min = 30.0
16831687
buy_11_rsi_1h_max = 84.0
1684-
buy_11_rsi = 37.0
1685-
buy_11_mfi = 36.0
1686-
buy_11_r_480 = -32.0
1687-
buy_11_r_480_1h = -16.0
1688+
buy_11_cti_1h_max = 0.91
1689+
buy_11_r_480_1h_max = -20.0
1690+
buy_11_crsi_1h_min = 26.0
16881691

16891692
buy_ma_offset_12 = 0.921
16901693
buy_rsi_12 = 28.0
@@ -4575,17 +4578,18 @@ def populate_buy_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
45754578
# Condition #11
45764579
elif index == 11:
45774580
# Non-Standard protections
4578-
item_buy_logic.append(dataframe['ema_50_1h'] > dataframe['ema_100_1h'])
45794581

45804582
# Logic
4581-
item_buy_logic.append(((dataframe['close'] - dataframe['open'].rolling(36).min()) / dataframe['open'].rolling(36).min()) > self.buy_11_min_inc)
4583+
item_buy_logic.append(((dataframe['close'] - dataframe['open'].rolling(6).min()) / dataframe['open'].rolling(6).min()) > self.buy_11_min_inc)
45824584
item_buy_logic.append(dataframe['close'] < dataframe['sma_30'] * self.buy_11_ma_offset)
4585+
item_buy_logic.append(dataframe['rsi_14'] < self.buy_11_rsi_max)
4586+
item_buy_logic.append(dataframe['mfi'] < self.buy_11_mfi_max)
4587+
item_buy_logic.append(dataframe['cci'] < self.buy_11_cci_max)
45834588
item_buy_logic.append(dataframe['rsi_14_1h'] > self.buy_11_rsi_1h_min)
45844589
item_buy_logic.append(dataframe['rsi_14_1h'] < self.buy_11_rsi_1h_max)
4585-
item_buy_logic.append(dataframe['rsi_14'] < self.buy_11_rsi)
4586-
item_buy_logic.append(dataframe['mfi'] < self.buy_11_mfi)
4587-
item_buy_logic.append(dataframe['r_480_1h'] < self.buy_11_r_480_1h)
4588-
item_buy_logic.append(dataframe['r_480'] < self.buy_11_r_480)
4590+
item_buy_logic.append(dataframe['cti_1h'] < self.buy_11_cti_1h_max)
4591+
item_buy_logic.append(dataframe['r_480_1h'] < self.buy_11_r_480_1h_max)
4592+
item_buy_logic.append(dataframe['crsi_1h'] > self.buy_11_crsi_1h_min)
45894593

45904594
# Condition #12
45914595
elif index == 12:

0 commit comments

Comments
 (0)