mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert further usages to calc_profit_combined

Browse Source
This commit is contained in:
Matthias
2023-08-29 21:35:03 +02:00
parent 399f144c27
commit ffb1cf52b1
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/rpc/rpc.py
+7 -5
View File
@@ -271,8 +271,9 @@ class RPC:
profit_str = f'{NAN:.2%}' profit_str = f'{NAN:.2%}'
else: else:
if trade.nr_of_successful_entries > 0: if trade.nr_of_successful_entries > 0:
trade_profit = trade.calc_profit(current_rate) profit = trade.calc_profit_combined(current_rate)
profit_str = f'{trade.calc_profit_ratio(current_rate):.2%}' trade_profit = profit.profit_abs
profit_str = f'{profit.profit_ratio:.2%}'
else: else:
trade_profit = 0.0 trade_profit = 0.0
profit_str = f'{0.0:.2f}' profit_str = f'{0.0:.2f}'
@@ -491,9 +492,10 @@ class RPC:
profit_ratio = NAN profit_ratio = NAN
profit_abs = NAN profit_abs = NAN
else: else:
profit_ratio = trade.calc_profit_ratio(rate=current_rate) profit = trade.calc_profit_combined(trade.close_rate or current_rate)
profit_abs = trade.calc_profit(
rate=trade.close_rate or current_rate) + trade.realized_profit profit_ratio = profit.profit_ratio
profit_abs = profit.total_profit
profit_all_coin.append(profit_abs) profit_all_coin.append(profit_abs)
profit_all_ratio.append(profit_ratio) profit_all_ratio.append(profit_ratio)