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

Convert ROI result to proper json object

Browse Source 
closes #4952
This commit is contained in:
Matthias 2021-05-17 20:58:50 +02:00
parent 3006396398
commit 6aa574fa2b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
freqtrade/optimize/hyperopt.py
View File

@ -185,7 +185,8 @@ class Hyperopt:
if HyperoptTools.has_space(self.config, 'sell'): if HyperoptTools.has_space(self.config, 'sell'):
result['sell'] = {p.name: params.get(p.name) for p in self.sell_space} result['sell'] = {p.name: params.get(p.name) for p in self.sell_space}
if HyperoptTools.has_space(self.config, 'roi'): if HyperoptTools.has_space(self.config, 'roi'):
result['roi'] = self.custom_hyperopt.generate_roi_table(params) result['roi'] = {str(k): v for k, v in
self.custom_hyperopt.generate_roi_table(params).items()}
if HyperoptTools.has_space(self.config, 'stoploss'): if HyperoptTools.has_space(self.config, 'stoploss'):
result['stoploss'] = {p.name: params.get(p.name) for p in self.stoploss_space} result['stoploss'] = {p.name: params.get(p.name) for p in self.stoploss_space}
if HyperoptTools.has_space(self.config, 'trailing'): if HyperoptTools.has_space(self.config, 'trailing'):

8
tests/optimize/test_hyperopt.py
View File

@ -649,10 +649,10 @@ def test_generate_optimizer(mocker, hyperopt_conf) -> None:
'rsi-enabled': False, 'rsi-enabled': False,
'rsi-value': 0, 'rsi-value': 0,
'trigger': 'macd_cross_signal'}, 'trigger': 'macd_cross_signal'},
'roi': {0: 0.12000000000000001, 'roi': {"0": 0.12000000000000001,
20.0: 0.02, "20.0": 0.02,
50.0: 0.01, "50.0": 0.01,
110.0: 0}, "110.0": 0},
'sell': {'sell-adx-enabled': False, 'sell': {'sell-adx-enabled': False,
'sell-adx-value': 0, 'sell-adx-value': 0,
'sell-fastd-enabled': True, 'sell-fastd-enabled': True,