Calcul 20240101-20250514 1113$ 279.8$

This commit is contained in:
Jérôme Delacotte
2025-05-21 22:47:45 +02:00
parent b2f5a9d23b
commit 5a67253624
2 changed files with 1294 additions and 1064 deletions

View File

@@ -997,7 +997,7 @@ class Zeus_8_3_2_B_4_2(IStrategy):
dataframe, _ = self.dp.get_analyzed_dataframe(trade.pair, self.timeframe) dataframe, _ = self.dp.get_analyzed_dataframe(trade.pair, self.timeframe)
last_candle = dataframe.iloc[-1].squeeze() last_candle = dataframe.iloc[-1].squeeze()
last_candle_1 = dataframe.iloc[-2].squeeze() before_last_candle = dataframe.iloc[-2].squeeze()
last_candle_2 = dataframe.iloc[-3].squeeze() last_candle_2 = dataframe.iloc[-3].squeeze()
last_candle_3 = dataframe.iloc[-4].squeeze() last_candle_3 = dataframe.iloc[-4].squeeze()
last_candle_previous_1h = dataframe.iloc[-13].squeeze() last_candle_previous_1h = dataframe.iloc[-13].squeeze()
@@ -1129,10 +1129,13 @@ class Zeus_8_3_2_B_4_2(IStrategy):
# print(f"{trade.pair} current_profit={current_profit} count_of_buys={count_of_buys} pct_first={pct_first:.3f} pct_palier={pct_palier:.3f} pct_max={pct_max:.3f} lim={lim:.3f} ") # print(f"{trade.pair} current_profit={current_profit} count_of_buys={count_of_buys} pct_first={pct_first:.3f} pct_palier={pct_palier:.3f} pct_max={pct_max:.3f} lim={lim:.3f} ")
# 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):
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)
limit_buy = 20 limit_buy = 20
if (count_of_buys < limit_buy) \ 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):
and (last_candle['enter_long'] == 1) \
and (pct_max < lim): # and val > self.buy_val_adjust.value and last_candle['mid_smooth_deriv1_1d'] > - 1):
try: try:
# print(f"{trade.pair} current_profit={current_profit} count_of_buys={count_of_buys} pct_first={pct_first:.3f} pct_max={pct_max:.3f} lim={lim:.3f} index={index}") # print(f"{trade.pair} current_profit={current_profit} count_of_buys={count_of_buys} pct_first={pct_first:.3f} pct_max={pct_max:.3f} lim={lim:.3f} index={index}")
# self.pairs[trade.pair]['last_palier_index'] = index # self.pairs[trade.pair]['last_palier_index'] = index

File diff suppressed because it is too large Load Diff