From b03c7b514ddca28f4b0f49807d0ac42d717d1f0c Mon Sep 17 00:00:00 2001 From: robcaulk Date: Fri, 6 May 2022 13:15:06 +0200 Subject: [PATCH] optional style for interfacing freqai with backtesting --- freqtrade/freqai/data_kitchen.py | 9 +-------- freqtrade/optimize/backtesting.py | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/freqtrade/freqai/data_kitchen.py b/freqtrade/freqai/data_kitchen.py index 38d518e23..600f82e21 100644 --- a/freqtrade/freqai/data_kitchen.py +++ b/freqtrade/freqai/data_kitchen.py @@ -304,13 +304,6 @@ class FreqaiDataKitchen: timerange_train.startts = timerange_train.startts + bt_period timerange_train.stopts = timerange_train.startts + train_period - # make sure we finish with a full backtest - # if timerange_train.stopts > config_timerange.stopts - bt_period: - # within_config_timerange = False - # timerange_train.stopts = config_timerange.stopts - bt_period - # # if a full training period doesnt fit, we stop - # if timerange_train.stopts > full_timerange.stopts: - # break first = False start = datetime.datetime.utcfromtimestamp(timerange_train.startts) stop = datetime.datetime.utcfromtimestamp(timerange_train.stopts) @@ -335,7 +328,7 @@ class FreqaiDataKitchen: if timerange_backtest.stopts == config_timerange.stopts: break - print(tr_training_list, tr_backtesting_list) + # print(tr_training_list, tr_backtesting_list) return tr_training_list, tr_backtesting_list def slice_dataframe(self, tr: str, df: DataFrame) -> DataFrame: diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index f976b1238..a753a3b07 100755 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -204,7 +204,7 @@ class Backtesting: """ self.progress.init_step(BacktestState.DATALOAD, 1) - if self.config['freqai']['train_period'] > 0: + if self.config.get('freqai', {}).get('train_period') > 0: self.required_startup += int((self.config['freqai']['train_period'] * 86400) / timeframe_to_seconds(self.config['timeframe'])) logger.info("Increasing startup_candle_count for freqai to %s", self.required_startup)