Skip to content

Commit 68ff42c

Browse files
iterativviterativv
committed
sell_under_main: rework.
1 parent fb297e4 commit 68ff42c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

‎NostalgiaForInfinityX.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2197,62 +2197,62 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
21972197
if last_candle['close'] < last_candle['ema_200']:
21982198
if (last_candle['ema_vwma_osc_96'] > 0.0):
21992199
if current_profit >= 0.20:
2200-
if (last_candle['rsi_14'] < 31.0) and (last_candle['cmf'] < 0.0):
2200+
if (last_candle['rsi_14'] < 32.0) and (last_candle['cmf'] < 0.0):
22012201
return True, 'sell_profit_u_bull_12_1'
22022202
elif (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < -0.4):
22032203
return True, 'sell_profit_u_bull_12_2'
22042204
elif 0.20 > current_profit >= 0.12:
2205-
if (last_candle['rsi_14'] < 33.0) and (last_candle['cmf'] < 0.0):
2205+
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
22062206
return True, 'sell_profit_u_bull_11_1'
22072207
elif (last_candle['rsi_14'] < 36.0) and (last_candle['cmf'] < -0.4):
22082208
return True, 'sell_profit_o_bull_11_2'
22092209
elif 0.12 > current_profit >= 0.10:
2210-
if (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < 0.0):
2210+
if (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < 0.0):
22112211
return True, 'sell_profit_u_bull_10_1'
22122212
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.4):
22132213
return True, 'sell_profit_u_bull_10_2'
22142214
elif 0.10 > current_profit >= 0.09:
2215-
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):
2215+
if (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < 0.0):
22162216
return True, 'sell_profit_u_bull_9_1'
22172217
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.4):
22182218
return True, 'sell_profit_u_bull_9_2'
22192219
elif 0.09 > current_profit >= 0.08:
2220-
if (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < 0.0):
2220+
if (last_candle['rsi_14'] < 48.0) and (last_candle['cmf'] < 0.0):
22212221
return True, 'sell_profit_u_bull_8_1'
22222222
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.4):
22232223
return True, 'sell_profit_u_bull_8_2'
22242224
elif 0.08 > current_profit >= 0.07:
2225-
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):
2225+
if (last_candle['rsi_14'] < 46.0) and (last_candle['cmf'] < 0.0):
22262226
return True, 'sell_profit_u_bull_7_1'
22272227
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
22282228
return True, 'sell_profit_u_bull_7_2'
22292229
elif 0.07 > current_profit >= 0.06:
2230-
if (last_candle['rsi_14'] < 43.0) and (last_candle['cmf'] < 0.0):
2230+
if (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < 0.0):
22312231
return True, 'sell_profit_u_bull_6_1'
22322232
elif (last_candle['rsi_14'] < 54.0) and (last_candle['cmf'] < -0.4):
22332233
return True, 'sell_profit_u_bull_6_2'
22342234
elif 0.06 > current_profit >= 0.05:
2235-
if (last_candle['rsi_14'] < 41.0) and (last_candle['cmf'] < 0.0):
2235+
if (last_candle['rsi_14'] < 42.0) and (last_candle['cmf'] < 0.0):
22362236
return True, 'sell_profit_u_bull_5_1'
22372237
elif (last_candle['rsi_14'] < 58.0) and (last_candle['cmf'] < -0.4):
22382238
return True, 'sell_profit_u_bull_5_2'
22392239
elif 0.05 > current_profit >= 0.04:
2240-
if (last_candle['rsi_14'] < 39.0) and (last_candle['cmf'] < 0.0):
2240+
if (last_candle['rsi_14'] < 40.0) and (last_candle['cmf'] < 0.0):
22412241
return True, 'sell_profit_u_bull_4_1'
22422242
elif (last_candle['rsi_14'] < 62.0) and (last_candle['cmf'] < -0.4):
22432243
return True, 'sell_profit_u_bull_4_2'
22442244
elif 0.04 > current_profit >= 0.03:
2245-
if (last_candle['rsi_14'] < 37.0) and (last_candle['cmf'] < 0.0):
2245+
if (last_candle['rsi_14'] < 38.0) and (last_candle['cmf'] < 0.0):
22462246
return True, 'sell_profit_u_bull_3_1'
22472247
elif (last_candle['rsi_14'] < 56.0) and (last_candle['cmf'] < -0.4):
22482248
return True, 'sell_profit_u_bull_3_2'
22492249
elif 0.03 > current_profit >= 0.02:
2250-
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
2250+
if (last_candle['rsi_14'] < 35.0) and (last_candle['cmf'] < 0.0):
22512251
return True, 'sell_profit_u_bull_2_1'
22522252
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
22532253
return True, 'sell_profit_u_bull_2_2'
22542254
elif 0.02 > current_profit >= 0.01:
2255-
if (last_candle['rsi_14'] < 33.0) and (last_candle['cmf'] < 0.0):
2255+
if (last_candle['rsi_14'] < 34.0) and (last_candle['cmf'] < 0.0):
22562256
return True, 'sell_profit_u_bull_1_1'
22572257
elif (last_candle['rsi_14'] < 44.0) and (last_candle['cmf'] < -0.4):
22582258
return True, 'sell_profit_u_bull_1_2'
@@ -2280,12 +2280,12 @@ def sell_under_main(self, current_profit: float, last_candle) -> tuple:
22802280
elif 0.09 > current_profit >= 0.08:
22812281
if (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < 0.0):
22822282
return True, 'sell_profit_u_bear_8_1'
2283-
elif (last_candle['rsi_14'] < 49.0) and (last_candle['cmf'] < -0.4):
2283+
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
22842284
return True, 'sell_profit_u_bear_8_2'
22852285
elif 0.08 > current_profit >= 0.07:
22862286
if (last_candle['rsi_14'] < 47.0) and (last_candle['cmf'] < 0.0):
22872287
return True, 'sell_profit_u_bear_7_1'
2288-
elif (last_candle['rsi_14'] < 50.0) and (last_candle['cmf'] < -0.4):
2288+
elif (last_candle['rsi_14'] < 52.0) and (last_candle['cmf'] < -0.4):
22892289
return True, 'sell_profit_u_bear_7_2'
22902290
elif 0.07 > current_profit >= 0.06:
22912291
if (last_candle['rsi_14'] < 45.0) and (last_candle['cmf'] < 0.0):

0 commit comments

Comments
 (0)