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

extract loading previous results to a method

Browse Source
This commit is contained in:
Janne Sinivirta 2018-06-25 11:38:14 +03:00
parent 17ee7f8be5
commit 0bddc58ec4
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
freqtrade/optimize/hyperopt.py
View File

@ -327,6 +327,15 @@ class Hyperopt(Backtesting):
def run_optimizer_parallel(self, parallel, asked) -> List: def run_optimizer_parallel(self, parallel, asked) -> List:
return parallel(delayed(self.generate_optimizer)(v) for v in asked) return parallel(delayed(self.generate_optimizer)(v) for v in asked)
def load_previous_results(self):
""" read trials file if we have one """
if os.path.exists(self.trials_file) and os.path.getsize(self.trials_file) > 0:
self.trials = self.read_trials()
logger.info(
'Loaded %d previous evaluations from disk.',
len(self.trials)
)
def start(self) -> None: def start(self) -> None:
timerange = Arguments.parse_timerange(None if self.config.get( timerange = Arguments.parse_timerange(None if self.config.get(
'timerange') is None else str(self.config.get('timerange'))) 'timerange') is None else str(self.config.get('timerange')))
@ -340,23 +349,13 @@ class Hyperopt(Backtesting):
if self.has_space('buy'): if self.has_space('buy'):
self.analyze.populate_indicators = Hyperopt.populate_indicators # type: ignore self.analyze.populate_indicators = Hyperopt.populate_indicators # type: ignore
self.processed = self.tickerdata_to_dataframe(data) self.processed = self.tickerdata_to_dataframe(data)
self.exchange = None self.exchange = None
self.load_previous_results()
logger.info('Preparing..')
# read trials file if we have one
if os.path.exists(self.trials_file) and os.path.getsize(self.trials_file) > 0:
self.trials = self.read_trials()
logger.info(
'Loaded %d previous evaluations from disk.',
len(self.trials)
)
cpus = multiprocessing.cpu_count() cpus = multiprocessing.cpu_count()
logger.info(f'Found {cpus}. Let\'s make them scream!') logger.info(f'Found {cpus}. Let\'s make them scream!')
opt = self.get_optimizer() opt = self.get_optimizer()
try: try:
with Parallel(n_jobs=-1) as parallel: with Parallel(n_jobs=-1) as parallel:
for i in range(self.total_tries//cpus): for i in range(self.total_tries//cpus):