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

Changes after review

Browse Source
This commit is contained in:
hroff-1902 2020-06-13 17:12:37 +03:00 committed by GitHub
parent 69ac5c1ac7
commit 3d9b107761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
freqtrade/optimize/hyperopt.py
View File

@ -230,6 +230,9 @@ class Hyperopt:
if space in ['buy', 'sell']: if space in ['buy', 'sell']:
result_dict.setdefault('params', {}).update(space_params) result_dict.setdefault('params', {}).update(space_params)
elif space == 'roi': elif space == 'roi':
# TODO: get rid of OrderedDict when support for python 3.6 will be
# dropped (dicts keep the order as the language feature)
# Convert keys in min_roi dict to strings because # Convert keys in min_roi dict to strings because
# rapidjson cannot dump dicts with integer keys... # rapidjson cannot dump dicts with integer keys...
# OrderedDict is used to keep the numeric order of the items # OrderedDict is used to keep the numeric order of the items
@ -244,21 +247,24 @@ class Hyperopt:
def _params_pretty_print(params, space: str, header: str) -> None: def _params_pretty_print(params, space: str, header: str) -> None:
if space in params: if space in params:
space_params = Hyperopt._space_params(params, space, 5) space_params = Hyperopt._space_params(params, space, 5)
print(f"\n # {header}") params_result = f"\n# {header}\n"
if space == 'stoploss': if space == 'stoploss':
print(" stoploss =", space_params.get('stoploss')) params_result += f"stoploss = {space_params.get('stoploss')}"
elif space == 'roi': elif space == 'roi':
minimal_roi_result = rapidjson.dumps( minimal_roi_result = rapidjson.dumps(
# TODO: get rid of OrderedDict when support for python 3.6 will be
# dropped (dicts keep the order as the language feature)
OrderedDict( OrderedDict(
(str(k), v) for k, v in space_params.items() (str(k), v) for k, v in space_params.items()
), ),
default=str, indent=4, number_mode=rapidjson.NM_NATIVE) default=str, indent=4, number_mode=rapidjson.NM_NATIVE)
minimal_roi_result = minimal_roi_result.replace("\n", "\n ") params_result += f"minimal_roi = {minimal_roi_result}"
print(f" minimal_roi = {minimal_roi_result}")
else: else:
params_result = pformat(space_params, indent=4).replace("}", "\n}") params_result += f"{space}_params = {pformat(space_params, indent=4)}"
params_result = params_result.replace("{", "{\n ").replace("\n", "\n ") params_result = params_result.replace("}", "\n}").replace("{", "{\n ")
print(f" {space}_params = {params_result}")
params_result = params_result.replace("\n", "\n ")
print(params_result)
@staticmethod @staticmethod
def _space_params(params, space: str, r: int = None) -> Dict: def _space_params(params, space: str, r: int = None) -> Dict: