CTYPTO/freqtrade
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2025-11-29 08:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: simplify diff in hyperopt-tinterface

Browse Source 
Use aliases where possible.
This commit is contained in:
Matthias
2025-04-23 20:15:24 +02:00
parent ca5ccc8799
commit 3fc40f45b3
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
freqtrade/optimize/hyperopt/hyperopt_interface.py
View File

@@ -13,12 +13,7 @@ from optuna.samplers import BaseSampler
from freqtrade.constants import Config from freqtrade.constants import Config
from freqtrade.exchange import timeframe_to_minutes from freqtrade.exchange import timeframe_to_minutes
from freqtrade.misc import round_dict from freqtrade.misc import round_dict
from freqtrade.optimize.space import ( from freqtrade.optimize.space import Categorical, Dimension, Integer, SKDecimal
DimensionProtocol,
SKDecimal,
ft_CategoricalDistribution,
ft_IntDistribution,
)
from freqtrade.strategy import IStrategy from freqtrade.strategy import IStrategy
@@ -45,7 +40,7 @@ class IHyperOpt(ABC):
# Assign timeframe to be used in hyperopt # Assign timeframe to be used in hyperopt
IHyperOpt.timeframe = str(config["timeframe"]) IHyperOpt.timeframe = str(config["timeframe"])
def generate_estimator(self, dimensions: list[DimensionProtocol], **kwargs) -> EstimatorType: def generate_estimator(self, dimensions: list[Dimension], **kwargs) -> EstimatorType:
""" """
Return base_estimator. Return base_estimator.
Can be any of "TPESampler", "GPSampler", "CmaEsSampler", "NSGAIISampler" Can be any of "TPESampler", "GPSampler", "CmaEsSampler", "NSGAIISampler"
@@ -69,7 +64,7 @@ class IHyperOpt(ABC):
return roi_table return roi_table
def roi_space(self) -> list[DimensionProtocol]: def roi_space(self) -> list[Dimension]:
""" """
Create a ROI space. Create a ROI space.
@@ -137,9 +132,9 @@ class IHyperOpt(ABC):
logger.info(f"Max roi table: {round_dict(self.generate_roi_table(p), 3)}") logger.info(f"Max roi table: {round_dict(self.generate_roi_table(p), 3)}")
return [ return [
ft_IntDistribution(roi_limits["roi_t1_min"], roi_limits["roi_t1_max"], "roi_t1"), Integer(roi_limits["roi_t1_min"], roi_limits["roi_t1_max"], name="roi_t1"),
ft_IntDistribution(roi_limits["roi_t2_min"], roi_limits["roi_t2_max"], "roi_t2"), Integer(roi_limits["roi_t2_min"], roi_limits["roi_t2_max"], name="roi_t2"),
ft_IntDistribution(roi_limits["roi_t3_min"], roi_limits["roi_t3_max"], "roi_t3"), Integer(roi_limits["roi_t3_min"], roi_limits["roi_t3_max"], name="roi_t3"),
SKDecimal( SKDecimal(
roi_limits["roi_p1_min"], roi_limits["roi_p1_max"], decimals=3, name="roi_p1" roi_limits["roi_p1_min"], roi_limits["roi_p1_max"], decimals=3, name="roi_p1"
), ),
@@ -151,7 +146,7 @@ class IHyperOpt(ABC):
), ),
] ]
def stoploss_space(self) -> list[DimensionProtocol]: def stoploss_space(self) -> list[Dimension]:
""" """
Create a stoploss space. Create a stoploss space.
@@ -175,7 +170,7 @@ class IHyperOpt(ABC):
"trailing_only_offset_is_reached": params["trailing_only_offset_is_reached"], "trailing_only_offset_is_reached": params["trailing_only_offset_is_reached"],
} }
def trailing_space(self) -> list[DimensionProtocol]: def trailing_space(self) -> list[Dimension]:
""" """
Create a trailing stoploss space. Create a trailing stoploss space.
@@ -188,7 +183,7 @@ class IHyperOpt(ABC):
# This parameter is included into the hyperspace dimensions rather than assigning # This parameter is included into the hyperspace dimensions rather than assigning
# it explicitly in the code in order to have it printed in the results along with # it explicitly in the code in order to have it printed in the results along with
# other 'trailing' hyperspace parameters. # other 'trailing' hyperspace parameters.
ft_CategoricalDistribution([True], name="trailing_stop"), Categorical([True], name="trailing_stop"),
SKDecimal(0.01, 0.35, decimals=3, name="trailing_stop_positive"), SKDecimal(0.01, 0.35, decimals=3, name="trailing_stop_positive"),
# 'trailing_stop_positive_offset' should be greater than 'trailing_stop_positive', # 'trailing_stop_positive_offset' should be greater than 'trailing_stop_positive',
# so this intermediate parameter is used as the value of the difference between # so this intermediate parameter is used as the value of the difference between
@@ -196,17 +191,17 @@ class IHyperOpt(ABC):
# generate_trailing_params() method. # generate_trailing_params() method.
# This is similar to the hyperspace dimensions used for constructing the ROI tables. # This is similar to the hyperspace dimensions used for constructing the ROI tables.
SKDecimal(0.001, 0.1, decimals=3, name="trailing_stop_positive_offset_p1"), SKDecimal(0.001, 0.1, decimals=3, name="trailing_stop_positive_offset_p1"),
ft_CategoricalDistribution([True, False], name="trailing_only_offset_is_reached"), Categorical([True, False], name="trailing_only_offset_is_reached"),
] ]
def max_open_trades_space(self) -> list[DimensionProtocol]: def max_open_trades_space(self) -> list[Dimension]:
""" """
Create a max open trades space. Create a max open trades space.
You may override it in your custom Hyperopt class. You may override it in your custom Hyperopt class.
""" """
return [ return [
ft_IntDistribution(-1, 10, name="max_open_trades"), Integer(-1, 10, name="max_open_trades"),
] ]
# This is needed for proper unpickling the class attribute timeframe # This is needed for proper unpickling the class attribute timeframe