CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2026-02-03 21:00:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

add None

Browse Source
This commit is contained in:
Stefano
2025-11-29 15:53:28 +09:00
parent b59db3c690
commit 645f70e216
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
freqtrade/data/metrics.py
View File

@@ -333,7 +333,10 @@ def calculate_expectancy(trades: pd.DataFrame) -> tuple[float, float]:
def calculate_sortino(
trades: pd.DataFrame, min_date: datetime, max_date: datetime, starting_balance: float
trades: pd.DataFrame,
min_date: datetime | None,
max_date: datetime | None,
starting_balance: float,
) -> float:
"""
Calculate sortino
@@ -361,7 +364,10 @@ def calculate_sortino(
def calculate_sharpe(
trades: pd.DataFrame, min_date: datetime, max_date: datetime, starting_balance: float
trades: pd.DataFrame,
min_date: datetime | None,
max_date: datetime | None,
starting_balance: float,
) -> float:
"""
Calculate sharpe
@@ -388,7 +394,10 @@ def calculate_sharpe(
def calculate_calmar(
trades: pd.DataFrame, min_date: datetime, max_date: datetime, starting_balance: float
trades: pd.DataFrame,
min_date: datetime | None,
max_date: datetime | None,
starting_balance: float,
) -> float:
"""
Calculate calmar

2
freqtrade/rpc/rpc.py
View File

@@ -719,7 +719,7 @@ class RPC:
starting_balance=starting_balance,
)
current_balance = self._freqtrade.wallets.get_total_stake_amount()
days_passed = max(1, (last_date - first_date).days)
days_passed = max(1, (last_date - first_date).days) if first_date and last_date else 1
cagr = calculate_cagr(
starting_balance=starting_balance,
final_balance=current_balance,