Correction Zeus_11
This commit is contained in:
@@ -272,7 +272,7 @@ class Zeus_11(IStrategy):
|
|||||||
if (last_candle['percent12'] <= -0.01) & (current_profit >= expected_profit):
|
if (last_candle['percent12'] <= -0.01) & (current_profit >= expected_profit):
|
||||||
self.trades = list()
|
self.trades = list()
|
||||||
return 'profit_' + str(count_of_buys)
|
return 'profit_' + str(count_of_buys)
|
||||||
if (last_candle['percent'] < 0.0) and ((last_candle['rsi'] >= 75) or before_last_candle['rsi'] >= 75):
|
if (current_profit >= expected_profit) & (last_candle['percent'] < 0.0) and ((last_candle['rsi'] >= 75) or before_last_candle['rsi'] >= 75):
|
||||||
self.trades = list()
|
self.trades = list()
|
||||||
return 'min_max200_' + str(count_of_buys)
|
return 'min_max200_' + str(count_of_buys)
|
||||||
|
|
||||||
@@ -599,8 +599,8 @@ class Zeus_11(IStrategy):
|
|||||||
if (len(dataframe) < 1):
|
if (len(dataframe) < 1):
|
||||||
return None
|
return None
|
||||||
pair = trade.pair
|
pair = trade.pair
|
||||||
# if pair not in ('BTC/USDC', 'DOGE/USDC', 'ETH/USDC'):
|
if pair not in ('BTC/USDC', 'XRP/USDC'):
|
||||||
# return None
|
return None
|
||||||
max_buys = 20
|
max_buys = 20
|
||||||
|
|
||||||
filled_buys = trade.select_filled_orders('buy')
|
filled_buys = trade.select_filled_orders('buy')
|
||||||
@@ -622,7 +622,7 @@ class Zeus_11(IStrategy):
|
|||||||
|
|
||||||
# if (days_since_open > count_of_buys) & (0 < count_of_buys <= max_buys) & (current_rate <= limit) & (last_candle['enter_long'] == 1):
|
# if (days_since_open > count_of_buys) & (0 < count_of_buys <= max_buys) & (current_rate <= limit) & (last_candle['enter_long'] == 1):
|
||||||
if ((last_candle['enter_long'] == 1) or last_candle['percent48'] < - 0.03) \
|
if ((last_candle['enter_long'] == 1) or last_candle['percent48'] < - 0.03) \
|
||||||
and ( hours > 48 or (current_profit < -0.015 * count_of_buys)):
|
and ( hours > 48 or (current_profit < -0.015 * count_of_buys and hours > 6)):
|
||||||
try:
|
try:
|
||||||
|
|
||||||
# This then calculates current safety order size
|
# This then calculates current safety order size
|
||||||
|
|||||||
Reference in New Issue
Block a user