From dcc3ef1309f4be6123bdd73016e9c97c361407d8 Mon Sep 17 00:00:00 2001 From: Stefano Ariestasia Date: Sat, 22 Jul 2023 09:18:22 +0900 Subject: [PATCH] flake8 fix --- freqtrade/rpc/rpc.py | 7 ++++--- tests/data/test_btanalysis.py | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index e9adec793..7d7dc4e77 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -535,12 +535,13 @@ class RPC: # winrate, # loserate) - expectancy = calculate_expectancy(trades) - expectancy_ratio = calculate_expectancy_ratio(trades) - trades_df = DataFrame([{'close_date': trade.close_date.strftime(DATETIME_PRINT_FORMAT), 'profit_abs': trade.close_profit_abs} for trade in trades if not trade.is_open and trade.close_date]) + + expectancy = calculate_expectancy(trades_df) + expectancy_ratio = calculate_expectancy_ratio(trades_df) + max_drawdown_abs = 0.0 max_drawdown = 0.0 if len(trades_df) > 0: diff --git a/tests/data/test_btanalysis.py b/tests/data/test_btanalysis.py index 76a33b386..83b0182d5 100644 --- a/tests/data/test_btanalysis.py +++ b/tests/data/test_btanalysis.py @@ -13,10 +13,10 @@ from freqtrade.data.btanalysis import (BT_DATA_COLUMNS, analyze_trade_parallelis load_backtest_metadata, load_trades, load_trades_from_db) from freqtrade.data.history import load_data, load_pair_history from freqtrade.data.metrics import (calculate_cagr, calculate_calmar, calculate_csum, - calculate_expectancy, calculate_expectancy_ratio, - calculate_market_change, calculate_max_drawdown, - calculate_sharpe, calculate_sortino, calculate_underwater, - combine_dataframes_with_mean, create_cum_profit) + calculate_expectancy_ratio, calculate_market_change, + calculate_max_drawdown, calculate_sharpe, calculate_sortino, + calculate_underwater, combine_dataframes_with_mean, + create_cum_profit) from freqtrade.exceptions import OperationalException from freqtrade.util import dt_utc from tests.conftest import CURRENT_TEST_STRATEGY, create_mock_trades