Calcul 20240101-20250514 1204$ 276.5$
This commit is contained in:
@@ -880,8 +880,8 @@ class Zeus_8_3_2_B_4_2(IStrategy):
|
||||
# & (dataframe['deriv2_1h'].shift(1) <= dataframe['deriv2_1h'])
|
||||
# (dataframe['deriv1_1h'] >= -0.01)
|
||||
# & (dataframe['deriv2_1h'] >= -0.00)
|
||||
(dataframe['mid_smooth_1h_deriv1'].shift(1) <= 0)
|
||||
& (dataframe['mid_smooth_1h_deriv1'] >= 0)
|
||||
(dataframe['mid_smooth_3_deriv1'].shift(2) >= dataframe['mid_smooth_3_deriv1'].shift(1))
|
||||
& (dataframe['mid_smooth_3_deriv1'].shift(1) <= dataframe['mid_smooth_3_deriv1'])
|
||||
#
|
||||
#
|
||||
# (dataframe['mid_smooth_1h_deriv1'] >= 0)
|
||||
@@ -1130,9 +1130,10 @@ class Zeus_8_3_2_B_4_2(IStrategy):
|
||||
|
||||
# if (days_since_open > count_of_buys) & (0 < count_of_buys <= max_buys) & (current_rate <= limit) & (last_candle['enter_long'] == 1):
|
||||
|
||||
condition = (last_candle['enter_long'] == 1 & count_of_buys < 3) \
|
||||
or ((before_last_candle['mid_re_smooth_3_deriv1'] <= 0) & (last_candle['mid_re_smooth_3_deriv1'] >= 0) & 3 <= count_of_buys < 6) \
|
||||
or ((before_last_candle['mid_smooth_1h'] <= 0) & (last_candle['mid_smooth_1h'] >= 0) & 6 <= count_of_buys)
|
||||
condition = True
|
||||
# (last_candle['enter_long'] == 1 & (count_of_buys < 3)) \
|
||||
# or ((before_last_candle['mid_re_smooth_3_deriv1'] <= 0) & (last_candle['mid_re_smooth_3_deriv1'] >= 0) & (3 <= count_of_buys < 6)) \
|
||||
# or ((before_last_candle['mid_smooth_1h_deriv1'] <= 0) & (last_candle['mid_smooth_1h_deriv1'] >= 0) & (6 <= count_of_buys))
|
||||
|
||||
limit_buy = 20
|
||||
if (count_of_buys < limit_buy) and condition and (pct_max < lim): # and val > self.buy_val_adjust.value and last_candle['mid_smooth_deriv1_1d'] > - 1):
|
||||
|
||||
Reference in New Issue
Block a user