diff --git a/freqtrade/freqai/data_kitchen.py b/freqtrade/freqai/data_kitchen.py index d525ae4ac..828734520 100644 --- a/freqtrade/freqai/data_kitchen.py +++ b/freqtrade/freqai/data_kitchen.py @@ -454,22 +454,8 @@ class FreqaiDataKitchen: start = datetime.datetime.fromtimestamp(timerange.startts, tz=datetime.timezone.utc) stop = datetime.datetime.fromtimestamp(timerange.stopts, tz=datetime.timezone.utc) df = df.loc[df["date"] >= start, :] - df = df.loc[df["date"] <= stop, :] - - return df - - def slice_dataframe_backtesting(self, timerange: TimeRange, df: DataFrame) -> DataFrame: - """ - Given a full dataframe, extract the user desired window - :param tr: timerange string that we wish to extract from df - :param df: Dataframe containing all candles to run the entire backtest. Here - it is sliced down to just the present training period. - """ - - start = datetime.datetime.fromtimestamp(timerange.startts, tz=datetime.timezone.utc) - stop = datetime.datetime.fromtimestamp(timerange.stopts, tz=datetime.timezone.utc) - df = df.loc[df["date"] >= start, :] - df = df.loc[df["date"] < stop, :] + if not self.live: + df = df.loc[df["date"] < stop, :] return df diff --git a/freqtrade/freqai/freqai_interface.py b/freqtrade/freqai/freqai_interface.py index b17f8c9ab..a9c21fb65 100644 --- a/freqtrade/freqai/freqai_interface.py +++ b/freqtrade/freqai/freqai_interface.py @@ -225,8 +225,8 @@ class IFreqaiModel(ABC): train_it += 1 total_trains = len(dk.backtesting_timeranges) self.training_timerange = tr_train - dataframe_train = dk.slice_dataframe_backtesting(tr_train, dataframe) - dataframe_backtest = dk.slice_dataframe_backtesting(tr_backtest, dataframe) + dataframe_train = dk.slice_dataframe(tr_train, dataframe) + dataframe_backtest = dk.slice_dataframe(tr_backtest, dataframe) trained_timestamp = tr_train tr_train_startts_str = datetime.datetime.utcfromtimestamp(tr_train.startts).strftime(