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

Convert all optimize to args_to_config

This commit is contained in:
Matthias 2019-04-24 21:12:08 +02:00
parent 39f60c4740
commit d6276a15d2
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
freqtrade/configuration.py
View File

@ -216,7 +216,7 @@ class Configuration(object):
logger.info(f'Created data directory: {datadir}') logger.info(f'Created data directory: {datadir}')
return datadir return datadir
def _args_to_config(self, config, argname, configname, logstring, logfun=None) -> bool: def _args_to_config(self, config, argname, configname, logstring, logfun=None) -> None:
""" """
logfun is applied to the configuration entry before passing logfun is applied to the configuration entry before passing
that entry to the log string using .format(). that entry to the log string using .format().
@ -230,7 +230,7 @@ class Configuration(object):
else: else:
logger.info(logstring.format(config[configname])) logger.info(logstring.format(config[configname]))
def _load_backtesting_config(self, config: Dict[str, Any]) -> Dict[str, Any]: # noqa: C901 def _load_backtesting_config(self, config: Dict[str, Any]) -> Dict[str, Any]:
""" """
Extract information for sys.argv and load Backtesting configuration Extract information for sys.argv and load Backtesting configuration
:return: configuration as dictionary :return: configuration as dictionary
@ -295,9 +295,8 @@ class Configuration(object):
:return: configuration as dictionary :return: configuration as dictionary
""" """
if 'timerange' in self.args and self.args.timerange: self._args_to_config(config, argname='timerange', configname='timerange',
config.update({'timerange': self.args.timerange}) logstring='Parameter --timerange detected: {} ...')
logger.info('Parameter --timerange detected: %s ...', self.args.timerange)
if 'stoploss_range' in self.args and self.args.stoploss_range: if 'stoploss_range' in self.args and self.args.stoploss_range:
txt_range = eval(self.args.stoploss_range) txt_range = eval(self.args.stoploss_range)
@ -306,9 +305,8 @@ class Configuration(object):
config['edge'].update({'stoploss_range_step': txt_range[2]}) config['edge'].update({'stoploss_range_step': txt_range[2]})
logger.info('Parameter --stoplosses detected: %s ...', self.args.stoploss_range) logger.info('Parameter --stoplosses detected: %s ...', self.args.stoploss_range)
if 'refresh_pairs' in self.args and self.args.refresh_pairs: self._args_to_config(config, argname='refresh_pairs', configname='refresh_pairs',
config.update({'refresh_pairs': True}) logstring='Parameter -r/--refresh-pairs-cached detected ...')
logger.info('Parameter -r/--refresh-pairs-cached detected ...')
return config return config
@ -318,35 +316,29 @@ class Configuration(object):
:return: configuration as dictionary :return: configuration as dictionary
""" """
if "hyperopt" in self.args: self._args_to_config(config, argname='hyperopt', configname='hyperopt',
# Add the hyperopt file to use logstring='Using Hyperopt file {}')
config.update({'hyperopt': self.args.hyperopt})
if 'epochs' in self.args and self.args.epochs: self._args_to_config(config, argname='epochs', configname='epochs',
config.update({'epochs': self.args.epochs}) logstring='Parameter --epochs detected ... '
logger.info('Parameter --epochs detected ...') 'Will run Hyperopt with for {} epochs ...'
logger.info('Will run Hyperopt with for %s epochs ...', config.get('epochs')) )
if 'spaces' in self.args and self.args.spaces: self._args_to_config(config, argname='spaces', configname='spaces',
config.update({'spaces': self.args.spaces}) logstring='Parameter -s/--spaces detected: {}')
logger.info('Parameter -s/--spaces detected: %s', config.get('spaces'))
if 'print_all' in self.args and self.args.print_all: self._args_to_config(config, argname='print_all', configname='print_all',
config.update({'print_all': self.args.print_all}) logstring='Parameter --print-all detected ...')
logger.info('Parameter --print-all detected: %s', config.get('print_all'))
if 'hyperopt_jobs' in self.args and self.args.hyperopt_jobs: self._args_to_config(config, argname='hyperopt_jobs', configname='hyperopt_jobs',
config.update({'hyperopt_jobs': self.args.hyperopt_jobs}) logstring='Parameter -j/--job-workers detected: {}')
logger.info('Parameter -j/--job-workers detected: %s', config.get('hyperopt_jobs'))
if 'refresh_pairs' in self.args and self.args.refresh_pairs: self._args_to_config(config, argname='refresh_pairs', configname='refresh_pairs',
config.update({'refresh_pairs': True}) logstring='Parameter -r/--refresh-pairs-cached detected ...')
logger.info('Parameter -r/--refresh-pairs-cached detected ...')
if 'hyperopt_random_state' in self.args and self.args.hyperopt_random_state is not None: self._args_to_config(config, argname='hyperopt_random_state',
config.update({'hyperopt_random_state': self.args.hyperopt_random_state}) configname='hyperopt_random_state',
logger.info("Parameter --random-state detected: %s", logstring='Parameter --random-state detected: {}')
config.get('hyperopt_random_state'))
return config return config