Skip to content

Commit 266b99f

Browse files
committed
Buy 37: rework.
1 parent 26b170c commit 266b99f

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

NostalgiaForInfinityNext.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,9 +1116,9 @@ class NostalgiaForInfinityNext(IStrategy):
11161116
"close_under_pivot_offset" : 1.0
11171117
},
11181118
37: {
1119-
"ema_fast" : False,
1119+
"ema_fast" : True,
11201120
"ema_fast_len" : "50",
1121-
"ema_slow" : False,
1121+
"ema_slow" : True,
11221122
"ema_slow_len" : "12",
11231123
"close_above_ema_fast" : False,
11241124
"close_above_ema_fast_len" : "200",
@@ -1129,13 +1129,13 @@ class NostalgiaForInfinityNext(IStrategy):
11291129
"sma200_1h_rising" : False,
11301130
"sma200_1h_rising_val" : "50",
11311131
"safe_dips" : True,
1132-
"safe_dips_type" : "30",
1133-
"safe_pump" : False,
1134-
"safe_pump_type" : "10",
1135-
"safe_pump_period" : "24",
1132+
"safe_dips_type" : "130",
1133+
"safe_pump" : True,
1134+
"safe_pump_type" : "120",
1135+
"safe_pump_period" : "48",
11361136
"btc_1h_not_downtrend" : False,
11371137
"close_over_pivot_type" : "none", # pivot, sup1, sup2, sup3, res1, res2, res3
1138-
"close_over_pivot_offset" : 0.92,
1138+
"close_over_pivot_offset" : 1.0,
11391139
"close_under_pivot_type" : "res3", # pivot, sup1, sup2, sup3, res1, res2, res3
11401140
"close_under_pivot_offset" : 1.5
11411141
},
@@ -1834,11 +1834,12 @@ class NostalgiaForInfinityNext(IStrategy):
18341834
buy_36_r_14_max = -97.0
18351835
buy_36_crsi_1h_min = 12.0
18361836

1837-
buy_37_ma_offset = 0.98
1838-
buy_37_ewo_min = 7.5
1837+
buy_37_ma_offset = 0.945
1838+
buy_37_ewo_min = 5.0
18391839
buy_37_rsi_max = 46.0
1840-
buy_37_cti_max = -0.85
1840+
buy_37_cti_max = -0.84
18411841
buy_37_r_14_max = -97.0
1842+
buy_37_close_1h_max = 0.04
18421843
buy_37_cti_1h_max = 0.92
18431844

18441845
buy_38_ma_offset = 0.98
@@ -3855,7 +3856,7 @@ def custom_sell(self, pair: str, trade: 'Trade', current_time: 'datetime', curre
38553856
return f"{signal_name} ( {buy_tag} )"
38563857

38573858
# Stoplosses
3858-
if any(c in ['empty', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '37', '38', '40', '41', '42', '44', '45', '46', '47', '48'] for c in buy_tags):
3859+
if any(c in ['empty', '20', '21', '22', '23', '24', '25', '26', '27', '28', '29', '30', '31', '38', '40', '41', '42', '44', '45', '46', '47', '48'] for c in buy_tags):
38593860
sell, signal_name = self.sell_stoploss_atr(current_profit, last_candle, previous_candle_1, trade, current_time)
38603861
if sell and (signal_name is not None):
38613862
return f"{signal_name} ( {buy_tag} )"
@@ -5099,6 +5100,7 @@ def populate_buy_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame:
50995100
item_buy_logic.append(dataframe['rsi_14'] < self.buy_37_rsi_max)
51005101
item_buy_logic.append(dataframe['cti'] < self.buy_37_cti_max)
51015102
item_buy_logic.append(dataframe['r_14'] < self.buy_37_r_14_max)
5103+
item_buy_logic.append(((dataframe['close_1h'].shift(12) - dataframe['close_1h']) / dataframe['close_1h']) < self.buy_37_close_1h_max)
51025104
item_buy_logic.append(dataframe['cti_1h'] < self.buy_37_cti_1h_max)
51035105

51045106
# Condition #38 - PMAX3 buy

0 commit comments

Comments
 (0)