PEP8 code compliance
This commit is contained in:
parent
c8e4687833
commit
0f943c482b
@ -446,8 +446,10 @@ def _calc_drawdown_series(profit_results: pd.DataFrame, *, date_col: str, value_
|
|||||||
max_balance = starting_balance + max_drawdown_df['high_value']
|
max_balance = starting_balance + max_drawdown_df['high_value']
|
||||||
max_drawdown_df['drawdown_relative'] = ((max_balance - cumulative_balance) / max_balance)
|
max_drawdown_df['drawdown_relative'] = ((max_balance - cumulative_balance) / max_balance)
|
||||||
else:
|
else:
|
||||||
# This is not completely accurate,
|
# This is not completely accurate
|
||||||
max_drawdown_df['drawdown_relative'] = ((max_drawdown_df['high_value'] - max_drawdown_df['cumulative']) / max_drawdown_df['high_value'])
|
max_drawdown_df['drawdown_relative'] = (
|
||||||
|
(max_drawdown_df['high_value'] - max_drawdown_df['cumulative'])
|
||||||
|
/ max_drawdown_df['high_value'])
|
||||||
return max_drawdown_df
|
return max_drawdown_df
|
||||||
|
|
||||||
|
|
||||||
@ -466,7 +468,11 @@ def calculate_underwater(trades: pd.DataFrame, *, date_col: str = 'close_date',
|
|||||||
if len(trades) == 0:
|
if len(trades) == 0:
|
||||||
raise ValueError("Trade dataframe empty.")
|
raise ValueError("Trade dataframe empty.")
|
||||||
profit_results = trades.sort_values(date_col).reset_index(drop=True)
|
profit_results = trades.sort_values(date_col).reset_index(drop=True)
|
||||||
max_drawdown_df = _calc_drawdown_series(profit_results, date_col=date_col, value_col=value_col, starting_balance=starting_balance)
|
max_drawdown_df = _calc_drawdown_series(
|
||||||
|
profit_results,
|
||||||
|
date_col=date_col,
|
||||||
|
value_col=value_col,
|
||||||
|
starting_balance=starting_balance)
|
||||||
|
|
||||||
return max_drawdown_df
|
return max_drawdown_df
|
||||||
|
|
||||||
@ -489,9 +495,15 @@ def calculate_max_drawdown(trades: pd.DataFrame, *, date_col: str = 'close_date'
|
|||||||
if len(trades) == 0:
|
if len(trades) == 0:
|
||||||
raise ValueError("Trade dataframe empty.")
|
raise ValueError("Trade dataframe empty.")
|
||||||
profit_results = trades.sort_values(date_col).reset_index(drop=True)
|
profit_results = trades.sort_values(date_col).reset_index(drop=True)
|
||||||
max_drawdown_df = _calc_drawdown_series(profit_results, date_col=date_col, value_col=value_col, starting_balance=starting_balance)
|
max_drawdown_df = _calc_drawdown_series(
|
||||||
|
profit_results,
|
||||||
|
date_col=date_col,
|
||||||
|
value_col=value_col,
|
||||||
|
starting_balance=starting_balance
|
||||||
|
)
|
||||||
|
|
||||||
idxmin = max_drawdown_df['drawdown_relative'].idxmax() if relative else max_drawdown_df['drawdown'].idxmin()
|
idxmin = max_drawdown_df['drawdown_relative'].idxmax() if relative \
|
||||||
|
else max_drawdown_df['drawdown'].idxmin()
|
||||||
if idxmin == 0:
|
if idxmin == 0:
|
||||||
raise ValueError("No losing trade, therefore no drawdown.")
|
raise ValueError("No losing trade, therefore no drawdown.")
|
||||||
high_date = profit_results.loc[max_drawdown_df.iloc[:idxmin]['high_value'].idxmax(), date_col]
|
high_date = profit_results.loc[max_drawdown_df.iloc[:idxmin]['high_value'].idxmax(), date_col]
|
||||||
|
@ -4,12 +4,11 @@ MaxDrawDownRelativeHyperOptLoss
|
|||||||
This module defines the alternative HyperOptLoss class which can be used for
|
This module defines the alternative HyperOptLoss class which can be used for
|
||||||
Hyperoptimization.
|
Hyperoptimization.
|
||||||
"""
|
"""
|
||||||
from datetime import datetime
|
|
||||||
from typing import Dict
|
from typing import Dict
|
||||||
|
|
||||||
from pandas import DataFrame
|
from pandas import DataFrame
|
||||||
|
|
||||||
from freqtrade.data.btanalysis import calculate_underwater, calculate_max_drawdown
|
from freqtrade.data.btanalysis import calculate_underwater
|
||||||
from freqtrade.optimize.hyperopt import IHyperOptLoss
|
from freqtrade.optimize.hyperopt import IHyperOptLoss
|
||||||
|
|
||||||
|
|
||||||
@ -34,7 +33,11 @@ class MaxDrawDownRelativeHyperOptLoss(IHyperOptLoss):
|
|||||||
"""
|
"""
|
||||||
total_profit = results['profit_abs'].sum()
|
total_profit = results['profit_abs'].sum()
|
||||||
try:
|
try:
|
||||||
drawdown_df = calculate_underwater(results, value_col='profit_abs', starting_balance=config['available_capital'])
|
drawdown_df = calculate_underwater(
|
||||||
|
results,
|
||||||
|
value_col='profit_abs',
|
||||||
|
starting_balance=config['available_capital']
|
||||||
|
)
|
||||||
max_drawdown = abs(min(drawdown_df['drawdown']))
|
max_drawdown = abs(min(drawdown_df['drawdown']))
|
||||||
relative_drawdown = max(drawdown_df['drawdown_relative'])
|
relative_drawdown = max(drawdown_df['drawdown_relative'])
|
||||||
if max_drawdown == 0:
|
if max_drawdown == 0:
|
||||||
@ -42,4 +45,3 @@ class MaxDrawDownRelativeHyperOptLoss(IHyperOptLoss):
|
|||||||
return -total_profit / max_drawdown / relative_drawdown
|
return -total_profit / max_drawdown / relative_drawdown
|
||||||
except (Exception, ValueError):
|
except (Exception, ValueError):
|
||||||
return -total_profit
|
return -total_profit
|
||||||
|
|
||||||
|
@ -164,7 +164,10 @@ def add_max_drawdown(fig, row, trades: pd.DataFrame, df_comb: pd.DataFrame,
|
|||||||
Add scatter points indicating max drawdown
|
Add scatter points indicating max drawdown
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
_, highdate, lowdate, _, _, max_drawdown = calculate_max_drawdown(trades, starting_balance=starting_balance)
|
_, highdate, lowdate, _, _, max_drawdown = calculate_max_drawdown(
|
||||||
|
trades,
|
||||||
|
starting_balance=starting_balance
|
||||||
|
)
|
||||||
|
|
||||||
drawdown = go.Scatter(
|
drawdown = go.Scatter(
|
||||||
x=[highdate, lowdate],
|
x=[highdate, lowdate],
|
||||||
@ -194,7 +197,11 @@ def add_underwater(fig, row, trades: pd.DataFrame, starting_balance: number) ->
|
|||||||
Add underwater plots
|
Add underwater plots
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
underwater = calculate_underwater(trades, value_col="profit_abs", starting_balance=starting_balance)
|
underwater = calculate_underwater(
|
||||||
|
trades,
|
||||||
|
value_col="profit_abs",
|
||||||
|
starting_balance=starting_balance
|
||||||
|
)
|
||||||
|
|
||||||
underwater_plot = go.Scatter(
|
underwater_plot = go.Scatter(
|
||||||
x=underwater['date'],
|
x=underwater['date'],
|
||||||
|
Loading…
Reference in New Issue
Block a user