Small reformatting in hyperopt
This commit is contained in:
parent
8ee0b0d8e8
commit
d069ad43d8
@ -243,7 +243,6 @@ class Hyperopt:
|
|||||||
"""
|
"""
|
||||||
backtest_start_time = datetime.now(timezone.utc)
|
backtest_start_time = datetime.now(timezone.utc)
|
||||||
params_dict = self._get_params_dict(self.dimensions, raw_params)
|
params_dict = self._get_params_dict(self.dimensions, raw_params)
|
||||||
params_details = self._get_params_details(params_dict)
|
|
||||||
|
|
||||||
# Apply parameters
|
# Apply parameters
|
||||||
if HyperoptTools.has_space(self.config, 'roi'):
|
if HyperoptTools.has_space(self.config, 'roi'):
|
||||||
@ -287,12 +286,13 @@ class Hyperopt:
|
|||||||
})
|
})
|
||||||
|
|
||||||
return self._get_results_dict(bt_results, self.min_date, self.max_date,
|
return self._get_results_dict(bt_results, self.min_date, self.max_date,
|
||||||
params_dict, params_details,
|
params_dict,
|
||||||
processed=processed)
|
processed=processed)
|
||||||
|
|
||||||
def _get_results_dict(self, backtesting_results, min_date, max_date,
|
def _get_results_dict(self, backtesting_results, min_date, max_date,
|
||||||
params_dict, params_details, processed: Dict[str, DataFrame]
|
params_dict, processed: Dict[str, DataFrame]
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
|
params_details = self._get_params_details(params_dict)
|
||||||
|
|
||||||
strat_stats = generate_strategy_stats(
|
strat_stats = generate_strategy_stats(
|
||||||
processed, self.backtesting.strategy.get_strategy_name(),
|
processed, self.backtesting.strategy.get_strategy_name(),
|
||||||
|
@ -688,6 +688,7 @@ def test_generate_optimizer(mocker, hyperopt_conf) -> None:
|
|||||||
'trailing_stop_positive': 0.02,
|
'trailing_stop_positive': 0.02,
|
||||||
'trailing_stop_positive_offset': 0.07}},
|
'trailing_stop_positive_offset': 0.07}},
|
||||||
'params_dict': optimizer_param,
|
'params_dict': optimizer_param,
|
||||||
|
'params_not_optimized': {'buy': {}, 'sell': {}},
|
||||||
'results_metrics': ANY,
|
'results_metrics': ANY,
|
||||||
'total_profit': 3.1e-08
|
'total_profit': 3.1e-08
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user