adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hyperopt: simplify parameter "can_optimize" handling

Browse Source
This commit is contained in:
Matthias 2022-08-19 15:03:03 +02:00
parent 16af10a5bc
commit 1c6f966579
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
freqtrade/strategy/parameters.py
View File

@ -57,6 +57,12 @@ class BaseParameter(ABC):
Get-space - will be used by Hyperopt to get the hyperopt Space Get-space - will be used by Hyperopt to get the hyperopt Space
""" """
def can_optimize(self):
return (
self.in_space
and self.optimize
)
class NumericParameter(BaseParameter): class NumericParameter(BaseParameter):
""" Internal parameter used for Numeric purposes """ """ Internal parameter used for Numeric purposes """
@ -133,7 +139,7 @@ class IntParameter(NumericParameter):
Returns a List with 1 item (`value`) in "non-hyperopt" mode, to avoid Returns a List with 1 item (`value`) in "non-hyperopt" mode, to avoid
calculating 100ds of indicators. calculating 100ds of indicators.
""" """
if self.in_space and self.optimize: if self.can_optimize():
# Scikit-optimize ranges are "inclusive", while python's "range" is exclusive # Scikit-optimize ranges are "inclusive", while python's "range" is exclusive
return range(self.low, self.high + 1) return range(self.low, self.high + 1)
else: else:
@ -212,7 +218,7 @@ class DecimalParameter(NumericParameter):
Returns a List with 1 item (`value`) in "non-hyperopt" mode, to avoid Returns a List with 1 item (`value`) in "non-hyperopt" mode, to avoid
calculating 100ds of indicators. calculating 100ds of indicators.
""" """
if self.in_space and self.optimize: if self.can_optimize():
low = int(self.low * pow(10, self._decimals)) low = int(self.low * pow(10, self._decimals))
high = int(self.high * pow(10, self._decimals)) + 1 high = int(self.high * pow(10, self._decimals)) + 1
return [round(n * pow(0.1, self._decimals), self._decimals) for n in range(low, high)] return [round(n * pow(0.1, self._decimals), self._decimals) for n in range(low, high)]
@ -261,7 +267,7 @@ class CategoricalParameter(BaseParameter):
Returns a List with 1 item (`value`) in "non-hyperopt" mode, to avoid Returns a List with 1 item (`value`) in "non-hyperopt" mode, to avoid
calculating 100ds of indicators. calculating 100ds of indicators.
""" """
if self.in_space and self.optimize: if self.can_optimize():
return self.opt_range return self.opt_range
else: else:
return [self.value] return [self.value]