From 860a4d239065132760947d0da7e507e462292943 Mon Sep 17 00:00:00 2001 From: Robert Caulk Date: Mon, 17 May 2021 11:40:57 +0200 Subject: [PATCH 1/2] update doc to reflect better empty dataframe check --- docs/strategy-advanced.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/strategy-advanced.md b/docs/strategy-advanced.md index 417218bc3..f5f706cd6 100644 --- a/docs/strategy-advanced.md +++ b/docs/strategy-advanced.md @@ -65,9 +65,10 @@ class AwesomeStrategy(IStrategy): trade_date = timeframe_to_prev_date(self.timeframe, trade.open_date_utc) # Look up trade candle. trade_candle = dataframe.loc[dataframe['date'] == trade_date] - # trade_candle may be None for trades that just opened as it is still incomplete. - if trade_candle is not None: + # trade_candle may be empty for trades that just opened as it is still incomplete. + if trade_candle.empty: # <...> + trade_candle = trade_candle.squeeze() ``` !!! Warning "Using .iloc[-1]" From 1a30e39222ae73ca32247ceccea1e881a437d6ca Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 21 May 2021 08:06:27 +0200 Subject: [PATCH 2/2] Move squeeze into if block --- docs/strategy-advanced.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/strategy-advanced.md b/docs/strategy-advanced.md index f5f706cd6..52879c7b4 100644 --- a/docs/strategy-advanced.md +++ b/docs/strategy-advanced.md @@ -40,7 +40,6 @@ class AwesomeStrategy(IStrategy): !!! Note If the data is pair-specific, make sure to use pair as one of the keys in the dictionary. - ## Dataframe access You may access dataframe in various strategy functions by querying it from dataprovider. @@ -67,8 +66,8 @@ class AwesomeStrategy(IStrategy): trade_candle = dataframe.loc[dataframe['date'] == trade_date] # trade_candle may be empty for trades that just opened as it is still incomplete. if trade_candle.empty: + trade_candle = trade_candle.squeeze() # <...> - trade_candle = trade_candle.squeeze() ``` !!! Warning "Using .iloc[-1]"