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

[SQUASH] Oopsies.

Browse Source
This commit is contained in:
Rokas Kupstys 2021-03-24 11:17:17 +02:00
parent bb89e44e19
commit 2d13e5fd50
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
freqtrade/optimize/hyperopt_auto.py
View File

@ -7,10 +7,10 @@ from typing import Any, Callable, Dict, List
from pandas import DataFrame from pandas import DataFrame
from skopt.space import Categorical, Dimension, Integer, Real # noqa from skopt.space import Categorical, Dimension, Integer, Real # noqa
from freqtrade.exceptions import OperationalException
from freqtrade.optimize.hyperopt_interface import IHyperOpt from freqtrade.optimize.hyperopt_interface import IHyperOpt
# noinspection PyUnresolvedReferences
class HyperOptAuto(IHyperOpt): class HyperOptAuto(IHyperOpt):
""" """
This class delegates functionality to Strategy(IHyperStrategy) and Strategy.HyperOpt classes. This class delegates functionality to Strategy(IHyperStrategy) and Strategy.HyperOpt classes.

14
freqtrade/strategy/hyper.py
View File

@ -2,7 +2,7 @@
IHyperStrategy interface, hyperoptable Parameter class. IHyperStrategy interface, hyperoptable Parameter class.
This module defines a base class for auto-hyperoptable strategies. This module defines a base class for auto-hyperoptable strategies.
""" """
from typing import Iterator, Tuple, Any, Optional, Sequence from typing import Iterator, Tuple, Any, Optional, Sequence, Union
from skopt.space import Integer, Real, Categorical from skopt.space import Integer, Real, Categorical
@ -22,7 +22,8 @@ class BaseParameter(object):
**kwargs): **kwargs):
""" """
Initialize hyperopt-optimizable parameter. Initialize hyperopt-optimizable parameter.
:param category: A parameter category. Can be 'buy' or 'sell'. This parameter is optional if parameter field :param category: A parameter category. Can be 'buy' or 'sell'. This parameter is optional if
parameter field
name is prefixed with 'buy_' or 'sell_'. name is prefixed with 'buy_' or 'sell_'.
:param kwargs: Extra parameters to skopt.space.(Integer|Real|Categorical). :param kwargs: Extra parameters to skopt.space.(Integer|Real|Categorical).
""" """
@ -37,6 +38,9 @@ class BaseParameter(object):
def __repr__(self): def __repr__(self):
return f'{self.__class__.__name__}({self.value})' return f'{self.__class__.__name__}({self.value})'
def get_space(self, name: str) -> Union[Integer, Real, Categorical]:
raise NotImplementedError()
class IntParameter(BaseParameter): class IntParameter(BaseParameter):
default: int default: int
@ -49,7 +53,8 @@ class IntParameter(BaseParameter):
Initialize hyperopt-optimizable parameter. Initialize hyperopt-optimizable parameter.
:param space: Optimization space, [min, max]. :param space: Optimization space, [min, max].
:param default: A default value. :param default: A default value.
:param category: A parameter category. Can be 'buy' or 'sell'. This parameter is optional if parameter field :param category: A parameter category. Can be 'buy' or 'sell'. This parameter is optional if
parameter field
name is prefixed with 'buy_' or 'sell_'. name is prefixed with 'buy_' or 'sell_'.
:param kwargs: Extra parameters to skopt.space.Integer. :param kwargs: Extra parameters to skopt.space.Integer.
""" """
@ -76,7 +81,8 @@ class FloatParameter(BaseParameter):
Initialize hyperopt-optimizable parameter. Initialize hyperopt-optimizable parameter.
:param space: Optimization space, [min, max]. :param space: Optimization space, [min, max].
:param default: A default value. :param default: A default value.
:param category: A parameter category. Can be 'buy' or 'sell'. This parameter is optional if parameter field :param category: A parameter category. Can be 'buy' or 'sell'. This parameter is optional if
parameter field
name is prefixed with 'buy_' or 'sell_'. name is prefixed with 'buy_' or 'sell_'.
:param kwargs: Extra parameters to skopt.space.Real. :param kwargs: Extra parameters to skopt.space.Real.
""" """