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

Fix small typos

This commit is contained in:
Matthias 2021-06-15 20:33:35 +02:00
parent d4514f5f16
commit 8ca0076332
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
freqtrade/optimize/hyperopt_tools.py
View File

@ -162,32 +162,33 @@ class HyperoptTools():
if space in params or space in non_optimized: if space in params or space in non_optimized:
space_params = HyperoptTools._space_params(params, space, 5) space_params = HyperoptTools._space_params(params, space, 5)
no_params = HyperoptTools._space_params(non_optimized, space, 5) no_params = HyperoptTools._space_params(non_optimized, space, 5)
appendix = ''
if not space_params and not no_params: if not space_params and not no_params:
# No parameters - don't print # No parameters - don't print
return return
if not space_params: if not space_params:
# Not optimized parameters - append string # Not optimized parameters - append string
non_optimized = NON_OPT_PARAM_APPENDIX appendix = NON_OPT_PARAM_APPENDIX
result = f"\n# {header}\n" result = f"\n# {header}\n"
if space == "stoploss": if space == "stoploss":
stoploss = safe_value_fallback2(space_params, no_params, space, space) stoploss = safe_value_fallback2(space_params, no_params, space, space)
result += (f"stoploss = {stoploss}{non_optimized}") result += (f"stoploss = {stoploss}{appendix}")
elif space == "roi": elif space == "roi":
result = result[:-1] + f'{non_optimized}\n' result = result[:-1] + f'{appendix}\n'
minimal_roi_result = rapidjson.dumps({ minimal_roi_result = rapidjson.dumps({
str(k): v for k, v in (space_params or no_params).items() str(k): v for k, v in (space_params or no_params).items()
}, default=str, indent=4, number_mode=rapidjson.NM_NATIVE) }, default=str, indent=4, number_mode=rapidjson.NM_NATIVE)
result += f"minimal_roi = {minimal_roi_result}" result += f"minimal_roi = {minimal_roi_result}"
elif space == "trailing": elif space == "trailing":
for k, v in (space_params or no_params).items(): for k, v in (space_params or no_params).items():
result += f"{k} = {v}{non_optimized}\n" result += f"{k} = {v}{appendix}\n"
else: else:
# Buy / sell parameters # Buy / sell parameters
result += f"{space}_params = {HyperoptTools.__pprint_dict(space_params, no_params)}" result += f"{space}_params = {HyperoptTools._pprint_dict(space_params, no_params)}"
result = result.replace("\n", "\n ") result = result.replace("\n", "\n ")
print(result) print(result)
@ -201,7 +202,7 @@ class HyperoptTools():
return {} return {}
@staticmethod @staticmethod
def __pprint_dict(params, non_optimized, indent: int = 4): def _pprint_dict(params, non_optimized, indent: int = 4):
""" """
Pretty-print hyperopt results (based on 2 dicts - with add. comment) Pretty-print hyperopt results (based on 2 dicts - with add. comment)
""" """

4
tests/optimize/test_hyperopttools.py
View File

@ -133,11 +133,11 @@ def test_show_epoch_details(capsys):
assert re.search(r'^\s+\"90\"\:\s0.14,\s*$', captured.out, re.MULTILINE) assert re.search(r'^\s+\"90\"\:\s0.14,\s*$', captured.out, re.MULTILINE)
def test___pprint_dict(): def test__pprint_dict():
params = {'buy_std': 1.2, 'buy_rsi': 31, 'buy_enable': True, 'buy_what': 'asdf'} params = {'buy_std': 1.2, 'buy_rsi': 31, 'buy_enable': True, 'buy_what': 'asdf'}
non_params = {'buy_notoptimied': 55} non_params = {'buy_notoptimied': 55}
x = HyperoptTools.__pprint_dict(params, non_params) x = HyperoptTools._pprint_dict(params, non_params)
assert x == """{ assert x == """{
"buy_std": 1.2, "buy_std": 1.2,
"buy_rsi": 31, "buy_rsi": 31,